git drama next steps

This commit is contained in:
rusefi 2019-06-25 20:38:08 -04:00
parent ccd9b6cce7
commit c008db2aea
2 changed files with 2 additions and 2 deletions

View File

@ -1,2 +0,0 @@
git fetch upstream
git merge origin/master

View File

@ -0,0 +1,2 @@
git fetch upstream
git merge upstream/master