Skip to content

Commit

Permalink
Fix rebase error
Browse files Browse the repository at this point in the history
  • Loading branch information
mtreinish committed May 3, 2023
1 parent 2060223 commit e2a836d
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
1 change: 0 additions & 1 deletion qiskit/circuit/library/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,6 @@
RVGate
PauliGate
LinearFunction
mcsu2_real_diagonal
Boolean Logic Circuits
======================
Expand Down
2 changes: 1 addition & 1 deletion qiskit/circuit/library/standard_gates/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
from .y import YGate, CYGate
from .z import ZGate, CZGate, CCZGate
from .global_phase import GlobalPhaseGate
from .multi_control_rotation_gates import mcrx, mcry, mcrz, mcsu2_real_diagonal
from .multi_control_rotation_gates import mcrx, mcry, mcrz


def get_standard_gate_name_mapping():
Expand Down

0 comments on commit e2a836d

Please sign in to comment.