Forgor to save

statisticsnorway · Dec 4, 2024 · 933325b · 933325b
1 parent 3d5d3bc
commit 933325b
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/.github/workflows/build-deploy-app.yml b/.github/workflows/build-deploy-app.yml
@@ -2,12 +2,8 @@ on:
   release:
     types: [ published ]
   pull_request: ## ONLY FOR TESTING, SHOULD BE REMOVED AFTER DEPLOY PR IS MERGED
-<<<<<<< HEAD
     branches: 
       - master
-=======
-    branches: [nais-deploy]
->>>>>>> master
   push:
     branches:
       - master