Self hosted FLOSS fitness/workout, nutrition and weight tracker
Remove conflicts left from previous merge
Roland Geider6cac2ee6bd18
diff --git a/wger/__init__.py b/wger/__init__.pyindex 29eae31ba..c78df6851 100644--- a/wger/__init__.py+++ b/wger/__init__.py@@ -5,13 +5,8 @@:license: GNU GPL, see LICENSE for more details."""-<<<<<<< local-VERSION = (1, 3, 0, 'final', 1)-RELEASE = True-=======VERSION = (1, 4, 0, 'alpha', 1)RELEASE = False->>>>>>> otherdef get_version(version=None, release=None):