remove git conlict marker

j-brn · Oct 26, 2023 · a9cd3de · a9cd3de
1 parent c7a110a
commit a9cd3de
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -17,12 +17,6 @@ concurrency:
 jobs:
   build:
     runs-on: ubuntu-latest
-<<<<<<< Updated upstream
-    needs:
-      - test
-
-=======
->>>>>>> Stashed changes
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4