From ca69b01d119850cd3f678eb894a86fd33a908e2d Mon Sep 17 00:00:00 2001
From: grossmj <grossmj@gns3.net>
Date: Sat, 24 Oct 2020 17:02:44 +1030
Subject: [PATCH] Use origin/3.0 for merge into gh-pages branch.

---
 .github/workflows/publish_api_documentation.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/publish_api_documentation.yml b/.github/workflows/publish_api_documentation.yml
index 8447eb49..59dc397d 100644
--- a/.github/workflows/publish_api_documentation.yml
+++ b/.github/workflows/publish_api_documentation.yml
@@ -21,7 +21,7 @@ jobs:
         python-version: 3.6
     - name: Merge changes from 3.0 branch
       run: |
-        git merge 3.0 -X theirs
+        git merge origin/3.0 -X theirs
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip