jyapayne/glymur
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix merge conflict

Browse source
This commit is contained in:
jevans 2014-10-01 18:55:19 -04:00
commit 6af4b7f0a7
1 changed files with 0 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
glymur/version.py
View file

@ -19,11 +19,7 @@ from .lib import openjp2 as opj2
# Do not change the format of this next line! Doing so risks breaking # Do not change the format of this next line! Doing so risks breaking
# setup.py # setup.py
<<<<<<< HEAD
version = "0.6.1"
=======
version = "0.7.0" version = "0.7.0"
>>>>>>> release-0.7.0rc1
_sv = LooseVersion(version) _sv = LooseVersion(version)
version_tuple = _sv.version version_tuple = _sv.version