From 249778e7d074fb06fab95b0955a12846e6c751cf Mon Sep 17 00:00:00 2001
From: Takeshi KOMIYA <i.tkomiya@gmail.com>
Date: Fri, 13 Nov 2020 01:08:46 +0900
Subject: [PATCH] Fix git merging error

---
 sphinx/__init__.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/sphinx/__init__.py b/sphinx/__init__.py
index 0669713ff4f..2b5d853e595 100644
--- 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.
 #: