Fix missed conflict (#469)

HabanaAI · Nov 6, 2024 · 0a17a2e · 0a17a2e
1 parent 5eb7f3d
commit 0a17a2e
Showing 1 changed file with 1 addition and 8 deletions.
diff --git a/.github/workflows/mypy.yaml b/.github/workflows/mypy.yaml
@@ -5,27 +5,20 @@ on:
   # but only for the habana_main branch
   push:
     branches:
-<<<<<<< HEAD
       - habana_main
-  pull_request:
-    branches:
-      - habana_main
-=======
-      - main
     paths:
       - '**/*.py'
       - '.github/workflows/mypy.yaml'
       - 'tools/mypy.sh'
       - 'pyproject.toml'
   pull_request:
     branches:
-      - main
+      - habana_main
     paths:
       - '**/*.py'
       - '.github/workflows/mypy.yaml'
       - 'tools/mypy.sh'
       - 'pyproject.toml'
->>>>>>> a5fda50a10641e47c0c290907f30ef2add6d4e7a
 
 jobs:
   mypy: