fix conflict

Expensify · Oct 24, 2024 · 196e022 · 196e022
1 parent 750b110
commit 196e022
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/.github/workflows/cla.yml b/.github/workflows/cla.yml
@@ -1,17 +1,10 @@
 name: CLA Assistant
 
 on:
-<<<<<<< Updated upstream
-  issue_comment:
-    types: [created]
-  pull_request_target:
-    types: [opened, closed, synchronize]
-=======
     issue_comment:
         types: [created]
     pull_request_target:
         types: [opened, synchronize]
->>>>>>> Stashed changes
 
 jobs:
   CLA: