Fix conflicts

Signed-off-by: JesusPoderoso <[email protected]>
eProsima · Mar 25, 2024 · a4f3230 · a4f3230
1 parent 050e2f7
commit a4f3230
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 28 deletions.
diff --git a/.github/workflows/address-sanitizers.yaml b/.github/workflows/address-sanitizers.yaml
@@ -13,13 +13,8 @@ on:
         default: '2.6.x'
 
   pull_request:
-<<<<<<< HEAD
-    branches:
-      - '2.6.x'
-=======
     types:
       - review_requested
->>>>>>> d0a334b11 (Only run PRs CI when run-ci label is added (#4599))
     paths-ignore:
       - '**.md'
       - '**.txt'

diff --git a/.github/workflows/documentation-tests.yaml b/.github/workflows/documentation-tests.yaml
@@ -9,13 +9,8 @@ on:
         default: '2.6.x'
 
   pull_request:
-<<<<<<< HEAD
-    branches:
-      - '2.6.x'
-=======
     types:
       - review_requested
->>>>>>> d0a334b11 (Only run PRs CI when run-ci label is added (#4599))
     paths-ignore:
       - '**.md'
       - '**.txt'

diff --git a/.github/workflows/mac-ci.yml b/.github/workflows/mac-ci.yml
@@ -25,13 +25,8 @@ on:
         required: true
 
   pull_request:
-<<<<<<< HEAD
-    branches:
-      - '2.6.x'
-=======
     types:
       - review_requested
->>>>>>> d0a334b11 (Only run PRs CI when run-ci label is added (#4599))
     paths-ignore:
       - '**.md'
       - '**.txt'

diff --git a/.github/workflows/thread-sanitizer.yaml b/.github/workflows/thread-sanitizer.yaml
@@ -16,13 +16,8 @@ on:
         type: string
 
   pull_request:
-<<<<<<< HEAD
-    branches:
-      - '2.6.x'
-=======
     types:
       - review_requested
->>>>>>> d0a334b11 (Only run PRs CI when run-ci label is added (#4599))
     paths-ignore:
       - '**.md'
       - '**.txt'

diff --git a/.github/workflows/ubuntu-ci.yml b/.github/workflows/ubuntu-ci.yml
@@ -24,8 +24,6 @@ on:
         type: string
         required: true
 
-<<<<<<< HEAD
-=======
   pull_request:
     types:
       - review_requested
@@ -34,7 +32,6 @@ on:
       - '**.txt'
       - '!**/CMakeLists.txt'
 
->>>>>>> d0a334b11 (Only run PRs CI when run-ci label is added (#4599))
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true

diff --git a/.github/workflows/windows-ci.yml b/.github/workflows/windows-ci.yml
@@ -25,13 +25,8 @@ on:
         required: true
 
   pull_request:
-<<<<<<< HEAD
-    branches:
-      - '2.6.x'
-=======
     types:
       - review_requested
->>>>>>> d0a334b11 (Only run PRs CI when run-ci label is added (#4599))
     paths-ignore:
       - '**.md'
       - '**.txt'