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