From ec6968b818fc1ee1a9a1bd6135a2858557fa4da5 Mon Sep 17 00:00:00 2001
From: Austin Huang <gengminghuang@gmail.com>
Date: Tue, 9 Jul 2024 14:06:56 -0400
Subject: [PATCH] fix merge conf

---
 setup.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/setup.py b/setup.py
index c3d73fd9..97730193 100644
--- 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",