From f933fa0e7851a25cfd546a3044f056910098063f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Acid=20Chicken=20=28=E7=A1=AB=E9=85=B8=E9=B6=8F=29?=
 <root@acid-chicken.com>
Date: Sun, 14 Jul 2019 10:05:19 +0900
Subject: [PATCH] Add FAQ in CONTRIBUTING.md

---
 CONTRIBUTING.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1d88812f7..a163f55a7 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -32,6 +32,12 @@ Misskey uses [vue-i18n](https://github.com/kazupon/vue-i18n).
 Misskey uses CircleCI for automated test.
 Configuration files are located in [`/.circleci`](/.circleci).
 
+## FAQ
+
+### Conflict occured at yarn.lock
+
+Just execute `npx yarn` (or `yarn` when you installed yarn in global) to fix it.
+
 ## Glossary
 ### AP
 Stands for _**A**ctivity**P**ub_.