Fixed bad merge.
parent
f004d97bf1
commit
b888063f11
|
|
@ -1,9 +1,5 @@
|
||||||
<<<<<<< Updated upstream
|
|
||||||
VERSION = (2, 0, 12)
|
|
||||||
=======
|
|
||||||
VERSION = (2, 0, 14)
|
VERSION = (2, 0, 14)
|
||||||
>>>>>>> Stashed changes
|
DEV_N = None
|
||||||
DEV_N = None
|
|
||||||
|
|
||||||
|
|
||||||
def get_version():
|
def get_version():
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue