Fix merge issues on gh-pages branch

This commit is contained in:
grossmj 2020-10-24 16:07:48 +10:30
parent a6a35e7c43
commit 3a136a46a1

View File

@ -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