chore(git): resolve conflict

carbon-design-system · Aug 22, 2024 · 5d21864 · 5d21864
1 parent abad41d
commit 5d21864
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -3,13 +3,9 @@ name: CI # Run CI Checks
 on:
   pull_request:
     branches:
-<<<<<<< HEAD
-      - feat/percy-integration
-=======
       - main
       - v1
       - 'release/v2*'
->>>>>>> 93395596b529fb2e1bb7591e8d4792f1ff1de7ff
   merge_group:
     types: [checks_requested]