summaryrefslogtreecommitdiff
path: root/CONTRIBUTING.md
diff options
context:
space:
mode:
authorAcid Chicken (硫酸鶏) <root@acid-chicken.com>2019-07-14 10:05:19 +0900
committerAcid Chicken (硫酸鶏) <root@acid-chicken.com>2019-07-14 10:06:10 +0900
commitf933fa0e7851a25cfd546a3044f056910098063f (patch)
tree319f279ebf61e3a256b56f3a606abc5fe4d0c966 /CONTRIBUTING.md
parentUse yarn instead of npm (diff)
downloadmisskey-f933fa0e7851a25cfd546a3044f056910098063f.tar.gz
misskey-f933fa0e7851a25cfd546a3044f056910098063f.tar.bz2
misskey-f933fa0e7851a25cfd546a3044f056910098063f.zip
Add FAQ in CONTRIBUTING.md
Diffstat (limited to 'CONTRIBUTING.md')
-rw-r--r--CONTRIBUTING.md6
1 files changed, 6 insertions, 0 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1d88812f76..a163f55a76 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_.