From 25245467a289d154b49dc0cd31f356f122ad0701 Mon Sep 17 00:00:00 2001
From: giles <giles.bradshaw@sigyl.com>
Date: Sun, 22 Oct 2023 00:11:07 +0100
Subject: [PATCH] lllllllllllllllllljjjjjjjjjjjjjjjjhtttttttttttttttttt

---
 .gitea/workflows/convert-to-yml.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitea/workflows/convert-to-yml.yml b/.gitea/workflows/convert-to-yml.yml
index 8182084..d07711e 100644
--- a/.gitea/workflows/convert-to-yml.yml
+++ b/.gitea/workflows/convert-to-yml.yml
@@ -41,7 +41,6 @@ jobs:
           git checkout ${{ env.PRODUCTION_BRANCH }}
           git pull origin ${{ env.PRODUCTION_BRANCH }}
           git log -5
-          git merge master
           git push origin HEAD
       - name: make pull request
         run: |