Fix RHEL workflow conflict

ros-controls · Feb 5, 2024 · afa75f0 · afa75f0
1 parent 1cda337
commit afa75f0
Showing 1 changed file with 0 additions and 9 deletions.
diff --git a/.github/workflows/rolling-rhel-binary-build.yml b/.github/workflows/rolling-rhel-binary-build.yml
@@ -1,16 +1,7 @@
 name: RHEL Rolling Binary Build
 on:
   workflow_dispatch:
-<<<<<<< HEAD
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
-  push:
-=======
   pull_request:
->>>>>>> 0bcb77b ([CI] debian + RHEL updates (#985))
     branches:
       - master
   schedule: