From 7463116c952ccb3ff2394f7d27ae4982aa4c93b5 Mon Sep 17 00:00:00 2001
From: perl_d <david.perl@psi.ch>
Date: Wed, 20 May 2026 11:09:36 +0200
Subject: [PATCH] fix: remove merge conflicts

---
 .gitea/workflows/create_update_pr.yml | 28 ++-------------------------
 1 file changed, 2 insertions(+), 26 deletions(-)

diff --git a/.gitea/workflows/create_update_pr.yml b/.gitea/workflows/create_update_pr.yml
index 98b4584..59cf6d6 100644
--- a/.gitea/workflows/create_update_pr.yml
+++ b/.gitea/workflows/create_update_pr.yml
@@ -6,47 +6,24 @@ permissions:
   pull-requests: write
 
 jobs:
-<<<<<<< before updating
-  test:
-    runs-on: ubuntu-latest
-=======
   create_update_branch_and_pr:
     runs-on: ubuntu-latest
     permissions:
       contents: write
       pull-requests: write
->>>>>>> after updating
 
     steps:
       - name: Setup Python
         uses: actions/setup-python@v5
         with:
           python-version: '3.12'
-<<<<<<< before updating
-    
-      - name: Install tools
-        run: |
-          pip install copier
-
-      - name: Checkout
-        uses: actions/checkout@v4
-    
-      - name: Perform update
-        run: |
-          branch="chore/update-template-$(python -m uuid)"
-          git checkout -b $branch
-          msg = $(copier update --trust --defaults --conflict inline 2>&1 | sed -n 1p)
-          git add -A
-          git diff-index --quiet HEAD || git commit -a -m $msg
-          git push -u origin $branch
-=======
 
       - name: Checkout
         uses: actions/checkout@v4
 
       - name: Create virtualenv
-	    run: |
-	      python -m virtualenv .venv
+        run: |
+    	  python -m virtualenv .venv
 
       - name: Install tools
         run: |
@@ -91,4 +68,3 @@ jobs:
                   \"head\": \"$(echo $branch)\",
                   \"base\": \"main\"
                 }"
->>>>>>> after updating