Update requirements-dev.txt

Fix conflict
qiskit-community · Apr 11, 2023 · 0f31742 · 0f31742
1 parent 4c4ea6e
commit 0f31742
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -6,11 +6,7 @@ pylatexenc>=1.4
 stestr>=2.0.0
 ddt>=1.2.0,!=1.4.0
 reno>=3.4.0
-<<<<<<< HEAD
-Sphinx>=1.8.3,!=3.1.0
-=======
 Sphinx>=5.0
->>>>>>> dd2ad0d (Various docs changes for CI (#253))
 sphinx-design>=0.2.0
 sphinx-gallery
 sphinxcontrib-spelling