Skip to content

Commit

Permalink
Fix conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
jakelishman committed Jan 31, 2024
1 parent ab3750d commit fb121ee
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit fb121ee

Please sign in to comment.