Use origin/3.0 for merge into gh-pages branch.

This commit is contained in:
grossmj committed 2020-10-24 17:02:44 +10:30
1 parent dd785b61cf
commit ca69b01d11
1 file changed
+1 -1
@@ -21,7 +21,7 @@ jobs:
python-version: 3.6
- name: Merge changes from 3.0 branch
run: |
git merge 3.0 -X theirs
git merge origin/3.0 -X theirs
- name: Install dependencies
run: |
python -m pip install --upgrade pip