From 0a17a2ecbd6056ab1b6b992697194b75fecded82 Mon Sep 17 00:00:00 2001
From: Konrad Zawora <kzawora@habana.ai>
Date: Wed, 6 Nov 2024 14:24:06 +0100
Subject: [PATCH] Fix missed conflict (#469)

---
 .github/workflows/mypy.yaml | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/.github/workflows/mypy.yaml b/.github/workflows/mypy.yaml
index 8e5afb2fc783a..500ad6db536c4 100644
--- a/.github/workflows/mypy.yaml
+++ b/.github/workflows/mypy.yaml
@@ -5,13 +5,7 @@ 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'
@@ -19,13 +13,12 @@ on:
       - 'pyproject.toml'
   pull_request:
     branches:
-      - main
+      - habana_main
     paths:
       - '**/*.py'
       - '.github/workflows/mypy.yaml'
       - 'tools/mypy.sh'
       - 'pyproject.toml'
->>>>>>> a5fda50a10641e47c0c290907f30ef2add6d4e7a
 
 jobs:
   mypy: