Fix conflict

Qiskit · Oct 24, 2024 · 6d9b032 · 6d9b032
1 parent ae9370a
commit 6d9b032
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -61,13 +61,7 @@ lint = [
     "qiskit-addon-cutting[style]",
     "mypy==1.11.2",
     "reno>=3.4.0",
-<<<<<<< HEAD
     "pylint==3.2.7",
-    # pydocstyle prefers to parse our pyproject.toml, hence the following line
-    "toml",
-=======
-    "pylint==3.3.1",
->>>>>>> 0415fc6 (Replace pydocstyle with Ruff (#692))
 ]
 docs = [
     "Sphinx>=3.0.0",