Fix git merging error

tk0miya · Nov 12, 2020 · 249778e · 249778e
1 parent a3af1e8
commit 249778e
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/sphinx/__init__.py b/sphinx/__init__.py
@@ -32,13 +32,8 @@
 warnings.filterwarnings('ignore', "'U' mode is deprecated",
                         DeprecationWarning, module='docutils.io')
 
-<<<<<<< HEAD
 __version__ = '3.4.0+'
 __released__ = '3.4.0'  # used when Sphinx builds its own docs
-=======
-__version__ = '3.3.2+'
-__released__ = '3.3.2'  # used when Sphinx builds its own docs
->>>>>>> 3.3.x
 
 #: Version info for better programmatic use.
 #: