merge conflict resolution for "consistent gate naming"#2

Cryoris merged 13 commits into

Cryoris:consistent_gate_namingCryoris/qiskit-terra:consistent_gate_namingfrom

ewinston:Cryoris-consistent_gate_namingewinston/qiskit:Cryoris-consistent_gate_namingCopy head branch name to clipboard