Fix conflict

Qiskit · Jan 31, 2024 · fb121ee · fb121ee
1 parent ab3750d
commit fb121ee
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/tox.ini b/tox.ini
@@ -35,15 +35,10 @@ basepython = python3
 package = editable
 allowlist_externals = cargo
 commands =
-<<<<<<< HEAD
-  ruff check qiskit test tools examples setup.py qiskit_pkg
   black --check {posargs} qiskit test tools examples setup.py qiskit_pkg
-=======
-  black --check {posargs} qiskit test tools examples setup.py
   cargo fmt --check
-  ruff check qiskit test tools examples setup.py
+  ruff check qiskit test tools examples setup.py qiskit_pkg
   cargo clippy -- -D warnings
->>>>>>> ed79d42d6 (Reconfigure CI pipelines for PR and merge queue (#11526))
   pylint -rn qiskit test tools
   # This line is commented out until #6649 merges. We can't run this currently
   # via tox because tox doesn't support globbing