From 4c79dd4e9672fb10dc0abbe3d9265ed581c9da0b Mon Sep 17 00:00:00 2001
From: "Acid Chicken (硫酸鶏)" <root@acid-chicken.com>
Date: Mon, 15 Jul 2019 21:32:09 +0900
Subject: Use yarn (#5154)

* Revert ":v:"

This reverts commit b5b437b8784eb32531e0965d722ddb691775df08.

* Welcome back, yarn.lock

[lockfiles for all](https://yarnpkg.com/blog/2016/11/24/lockfiles-for-all/)

* Use alpine package registry instead of npm's

* Avoid npx

* Remove `"`

* Follow review

refs: https://github.com/syuilo/misskey/pull/5154#discussion_r303227256

* Update lockfile

* Use yarn instead of npm run

refs: https://github.com/syuilo/misskey/pull/5154#discussion_r303227285

* Back to npm

* Follow review

refs: https://github.com/syuilo/misskey/pull/5154#discussion_r303292279
---
 CONTRIBUTING.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'CONTRIBUTING.md')

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f3bb17898d..548c76910b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -35,7 +35,8 @@ Configuration files are located in [`/.circleci`](/.circleci).
 ## FAQ
 
 ### How to resolve conflictions occurred at yarn.lock?
-Just execute `npx yarn` (or `yarn` when you have yarn installed globally) to fix it.
+
+Just execute `yarn` to fix it.
 
 ## Glossary
 ### AP
-- 
cgit v1.2.3-freya