Correct build-main workflow

2024-05-12 11:33:34 +00:00 · 2024-05-12 11:33:34 +00:00 · 76ee09a143
commit 76ee09a143
parent f83d27e411
1 changed files with 0 additions and 4 deletions
--- 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