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