Merge pull request #19 from SciNim/dev

fix gh-pages conflicting
SciNim · Apr 8, 2021 · 7ffb5b5 · 7ffb5b5
2 parents 9b84618 + b952daf
commit 7ffb5b5
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Fetch
         run: git fetch
       - name: Rebase
-        run: git rebase origin/master
+        run: git rebase origin/master --ours
       - name: Gendoc
         run: nimble gendoc
       - name: Commit files