IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix git merging error

Browse Source
This commit is contained in:
Takeshi KOMIYA
2020-11-13 01:08:46 +09:00
parent a3af1e860b
commit 249778e7d0
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sphinx/__init__.py
View File

@@ -32,13 +32,8 @@ if 'PYTHONWARNINGS' not in os.environ:
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.
#: