Fix issue with version

UmSenhorQualquer · UmSenhorQualquer · commit fb52c4d670d6 · 2019-08-16T13:33:46.000+01:00
diff --git a/pythonvideoannotator_models_gui/__init__.py b/pythonvideoannotator_models_gui/__init__.py
@@ -1,6 +1,2 @@
 from confapp import conf; conf += 'pythonvideoannotator_models_gui.settings'
-<<<<<<< Updated upstream
-__version__ = "0.6.57"
-=======
 __version__ = "0.7.57"
->>>>>>> Stashed changes
