arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-28 11:18:11 +00:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
grossmj 2020-10-24 17:02:44 +10:30
parent dd785b61cf
commit ca69b01d11
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/publish_api_documentation.yml vendored
View File

@ -21,7 +21,7 @@ jobs:
python-version: 3.6 python-version: 3.6
- name: Merge changes from 3.0 branch - name: Merge changes from 3.0 branch
run: | run: |
git merge 3.0 -X theirs git merge origin/3.0 -X theirs
- name: Install dependencies - name: Install dependencies
run: | run: |
python -m pip install --upgrade pip python -m pip install --upgrade pip