fix: merge

ApeWorX · Oct 29, 2024 · 467c8e1 · 467c8e1
1 parent e3fc93c
commit 467c8e1
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 8 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -22,11 +22,7 @@ repos:
         additional_dependencies: [flake8-breakpoint, flake8-print, flake8-pydantic, flake8-type-checking]
 
 -   repo: https://github.com/pre-commit/mirrors-mypy
-<<<<<<< HEAD
     rev: v1.13.0
-=======
-    rev: v1.12.0
->>>>>>> 272d524 (chore: lint)
     hooks:
     -   id: mypy
         additional_dependencies: [types-setuptools, pydantic]

diff --git a/setup.py b/setup.py
@@ -11,11 +11,7 @@
     ],
     "lint": [
         "black>=24.10.0,<25",  # Auto-formatter and linter
-<<<<<<< HEAD
         "mypy>=1.13.0,<2",  # Static type analyzer
-=======
-        "mypy>=1.12.0,<2",  # Static type analyzer
->>>>>>> 272d524 (chore: lint)
         "types-setuptools",  # Needed for mypy type shed
         "flake8>=7.1.1,<8",  # Style linter
         "flake8-breakpoint>=1.1.0,<2",  # Detect breakpoints left in code