Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

docs: Remove the yarn.lock stutter. 

Maybe someday someone will spot this err. However, the documentation is
clear in conveying its content even with the extra yarn.lock.
This commit is contained in:
rht 2017-09-30 12:00:58 +02:00 committed by Tim Abbott
parent f82c5e9626
commit e0f7b6f8ef
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/git-guide.md
View File

@ -1462,7 +1462,7 @@ Deleting local branch review-original-5156 (was 5a1e982)
### Merge conflict on yarn.lock file
If there is a merge conflict on yarn.lock, yarn.lock, yarn should be run to
If there is a merge conflict on yarn.lock, yarn should be run to
regenerate the file. *Important* don't delete the yarn.lock file. Checkout the
latest one from origin/master so that yarn knows the previous asset versions.