Skip to content

Commit

Permalink
remove trailing merge message in docstring
Browse files Browse the repository at this point in the history
  • Loading branch information
Cryoris committed May 23, 2023
1 parent d04f0e1 commit 71994c4
Showing 1 changed file with 1 addition and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -89,14 +89,7 @@ def _mcsu2_real_diagonal(
ctrl_state: Optional[str] = None,
use_basis_gates: bool = False,
) -> QuantumCircuit:
"""
<<<<<<< HEAD
Apply multi-controlled SU(2) gate with a real main diagonal or secondary diagonal.
The algorithm this method implements is described in: https://arxiv.org/abs/2302.06377
=======
Return a multi-controlled SU(2) gate [1]_ with a real main diagonal or secondary diagonal.
>>>>>>> 7b677edf1 (Fix wrong relative phase of MCRZ (#9836))
"""Return a multi-controlled SU(2) gate [1]_ with a real main diagonal or secondary diagonal.
Args:
unitary: SU(2) unitary matrix with one real diagonal.
Expand Down

0 comments on commit 71994c4

Please sign in to comment.