mirror of
https://github.com/GNS3/gns3-server.git
synced 2026-11-03 05:51:15 +02:00
Use origin/3.0 for merge into gh-pages branch.
This commit is contained in:
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
|
||||
|
||||
Reference in new issue
Block a user