Fixed unreslved merge conflict in github action workflow

jaenrig-ifx · jaenrig-ifx · commit 5d3bc7b94d52 · 2022-06-21T15:17:41.000+02:00
diff --git a/.github/workflows/build-check.yml b/.github/workflows/build-check.yml
@@ -3,11 +3,7 @@ name: build-check
 
 on:
   push:
-<<<<<<< HEAD
-    branches: [ develop, master, release/v3.0.0 ]
-=======
     branches: [ develop, master ]
->>>>>>> master
   pull_request:
     branches: [ develop, master ]
       
