mirror of
https://github.com/GNS3/gns3-server.git
synced 2024-11-16 16:54:51 +02:00
Fix merge issues on gh-pages branch
This commit is contained in:
parent
a6a35e7c43
commit
3a136a46a1
@ -37,6 +37,5 @@ jobs:
|
||||
git add docs
|
||||
git status
|
||||
git commit -m "Publish API documentation"
|
||||
git checkout gh-pages
|
||||
git merge 3.0
|
||||
git checkout --theirs gh-pages
|
||||
git push
|
||||
|
Loading…
Reference in New Issue
Block a user