fix merge conf

PennyLaneAI · Jul 9, 2024 · ec6968b · ec6968b
1 parent d9baa67
commit ec6968b
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/setup.py b/setup.py
@@ -25,12 +25,7 @@
     "qiskit>=0.32",
     "qiskit-aer",
     "qiskit-ibm-runtime",
-<<<<<<< HEAD
-    "qiskit-ibm-provider",
-    "pennylane>=0.30",
-=======
     "pennylane>=0.37",
->>>>>>> master
     "numpy",
     "sympy<1.13",
     "networkx>=2.2",