arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-12-01 04:38:12 +00:00
Code Issues Releases Wiki Activity

Fix merge issues on gh-pages branch, second try.

Browse Source
This commit is contained in:
grossmj 2020-10-24 16:12:17 +10:30
parent 3a136a46a1
commit f9c4c82da6
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,5 +37,6 @@ jobs:
git add docs git add docs
git status git status
git commit -m "Publish API documentation" git commit -m "Publish API documentation"
git checkout --theirs gh-pages git checkout gh-pages
git merge 3.0 --theirs
git push git push