revert accidental change

datahub-project · Nov 10, 2022 · 2a6dde2 · 2a6dde2
1 parent 4a629d7
commit 2a6dde2
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/metadata-ingestion/setup.py b/metadata-ingestion/setup.py
@@ -373,10 +373,14 @@ def get_long_description():
     "flake8>=3.8.3",
     "flake8-tidy-imports>=4.3.0",
     "isort>=5.7.0",
+<<<<<<< HEAD
     # mypy 0.990 enables namespace packages by default and sets
     # no implicit optional to True.
     # FIXME: Enable mypy 0.990 when our codebase is fixed.
     "mypy>=0.981,<0.990",
+=======
+    "mypy>=0.981",
+>>>>>>> revert accidental change
     # pydantic 1.8.2 is incompatible with mypy 0.910.
     # See https://github.com/samuelcolvin/pydantic/pull/3175#issuecomment-995382910.
     # Restricting top version to <1.10 until we can fix our types.