bug fix

alexylem · Mar 18, 2017 · 03efdb0 · 03efdb0
1 parent 6da29ed
commit 03efdb0
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/version.txt b/version.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
 17.03.18
-=======
-17.03.14
->>>>>>> origin/pr/478