From 861b7e86ff4d5f2860f7b6173ba471b2ce49ac56 Mon Sep 17 00:00:00 2001 From: grossmj Date: Mon, 31 Aug 2026 12:28:03 +0200 Subject: [PATCH] fix: publish-api-documentation.yml --- .github/workflows/publish-api-documentation.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish-api-documentation.yml b/.github/workflows/publish-api-documentation.yml index ad64fc525..acd816f53 100644 --- a/.github/workflows/publish-api-documentation.yml +++ b/.github/workflows/publish-api-documentation.yml @@ -19,11 +19,11 @@ jobs: - uses: actions/setup-python@v6 with: python-version: 3.12 - - name: Merge changes from 3.0 branch + - name: Merge changes from 3.1 branch run: | git config user.name github-actions git config user.email github-actions@github.com - git merge origin/3.0 -X theirs + git merge origin/3.1 -X theirs - name: Install GNS3 server and dependencies run: | python -m pip install --upgrade pip