Fixed bad merge.

This commit is contained in:
Brandon Taylor
2016-03-14 11:12:01 -04:00
parent f004d97bf1
commit b888063f11
-4
View File
@@ -1,8 +1,4 @@
<<<<<<< Updated upstream
VERSION = (2, 0, 12)
=======
VERSION = (2, 0, 14)
>>>>>>> Stashed changes
DEV_N = None