Fixed bad merge.
This commit is contained in:
1 parent
f004d97bf1
commit
b888063f11
1 file changed
+1
-5
@@ -1,9 +1,5 @@
|
||||
<<<<<<< Updated upstream
|
||||
VERSION = (2, 0, 12)
|
||||
=======
|
||||
VERSION = (2, 0, 14)
|
||||
>>>>>>> Stashed changes
|
||||
DEV_N = None
|
||||
DEV_N = None
|
||||
|
||||
|
||||
def get_version():
|
||||
|
||||
Reference in new issue
Block a user