mirror of
https://github.com/GNS3/gns3-server
synced 2024-12-25 16:28:11 +00:00
Use origin/3.0 for merge into gh-pages branch.
This commit is contained in:
parent
dd785b61cf
commit
ca69b01d11
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user