From e60adb5743b823c8991481b030de7d6257974a10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elena=20Pe=C3=B1a=20Tapia?= Date: Mon, 13 Nov 2023 09:49:38 +0100 Subject: [PATCH] Fix conflict --- docs/apidoc/index.rst | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/docs/apidoc/index.rst b/docs/apidoc/index.rst index 3c8841ef6f19..eb5ed9e3c2c5 100644 --- 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