From 71994c4852d01272bf029c506ad5255312fc66ba Mon Sep 17 00:00:00 2001 From: Julien Gacon Date: Tue, 23 May 2023 12:49:03 +0200 Subject: [PATCH] remove trailing merge message in docstring --- .../standard_gates/multi_control_rotation_gates.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/qiskit/circuit/library/standard_gates/multi_control_rotation_gates.py b/qiskit/circuit/library/standard_gates/multi_control_rotation_gates.py index fa9686556fbe..f4e4502f24eb 100644 --- a/qiskit/circuit/library/standard_gates/multi_control_rotation_gates.py +++ b/qiskit/circuit/library/standard_gates/multi_control_rotation_gates.py @@ -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.