Fix merge conflicts

Expensify · Oct 28, 2024 · dd7301e · dd7301e
1 parent 1fb1f28
commit dd7301e
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/.github/workflows/createNewVersion.yml b/.github/workflows/createNewVersion.yml
@@ -101,8 +101,6 @@ jobs:
         uses: ./.github/actions/composite/announceFailedWorkflowInSlack
         with:
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
-<<<<<<< HEAD
-=======
 
   createNewHybridVersion:
     runs-on: macos-latest
@@ -192,4 +190,3 @@ jobs:
         uses: ./.github/actions/composite/announceFailedWorkflowInSlack
         with:
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
->>>>>>> 73b7785 (Merge pull request #51602 from Expensify/andrew-fix-commit)