From 76ee09a143c8b442d0109735290e0eed429b7dda Mon Sep 17 00:00:00 2001
From: MrMeeb <mrmeeb@noreply.git.mrmeeb.stream>
Date: Sun, 12 May 2024 11:33:34 +0000
Subject: [PATCH] Correct build-main workflow

---
 .gitea/workflows/build-main.yaml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.gitea/workflows/build-main.yaml b/.gitea/workflows/build-main.yaml
index d694d6f..83af6eb 100644
--- a/.gitea/workflows/build-main.yaml
+++ b/.gitea/workflows/build-main.yaml
@@ -75,11 +75,7 @@ jobs:
 
   "Notify":
     runs-on: [ubuntu-docker-latest, linux/amd64]
-<<<<<<< HEAD
-    needs: ["Build Image", "Validate Image"]
-=======
     needs: ["Validate Image", "Publish Image"]
->>>>>>> automation
     steps:
       - name: Notify of success
         uses: rjstone/discord-webhook-notify@v1