resolve conflict

Qiskit · Dec 12, 2024 · 5cb5695 · 5cb5695
1 parent c44e64e
commit 5cb5695
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -62,12 +62,8 @@ lint = [
     "qiskit-addon-cutting[style]",
     "mypy==1.11.2",
     "reno>=3.4.0",
-<<<<<<< HEAD
     "pylint==3.2.7",
-=======
-    "pylint==3.3.1",
     "numpy<2.2",
->>>>>>> d44ca0a (Pin numpy<2.2 in lint workflow (#722))
 ]
 docs = [
     "Sphinx>=3.0.0",