Fix conflict

ElePT · Nov 13, 2023 · e60adb5 · e60adb5
1 parent 9a63700
commit e60adb5
Showing 1 changed file with 0 additions and 15 deletions.
diff --git a/docs/apidoc/index.rst b/docs/apidoc/index.rst
@@ -45,18 +45,3 @@ API Reference
    transpiler_builtin_plugins
    utils
    exceptions
-<<<<<<< HEAD
-=======
-
-Deprecated Modules
-==================
-
-.. warning::
-
-   These modules are going to be removed in Qiskit 1.0. Consider pinning ``qiskit~=0.45`` in your dependencies if you need them.
-
-.. toctree::
-   :maxdepth: 1
-
-   opflow
->>>>>>> 7ef9547447c62dc891a49f58a928b1d3a626083f