Remove artifact from resolving conflict

Co-authored-by: Kalila <69767640+digisomni@users.noreply.github.com>
This commit is contained in:
Adam Ivie 2020-12-16 18:37:19 -05:00 committed by GitHub
parent d20ffd30c6
commit 3a7195c21c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -21,7 +21,6 @@ Contributing
6. Update your branch
```
git remote add upstream https://github.com/vircadia/vircadia
git pull upstream master
```