Update version.txt

ahmadnourallah · web-flow · commit e927cb0097d1 · 2017-07-18T17:57:15.000-04:00
diff --git a/core/version.txt b/core/version.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
 1.1
-=======
-1.0
->>>>>>> d09227afd58226ed6801a3029f468483e56e4ad1

-Original file line number
+Diff line change
@@ @@ -1,5 +1 @@ @@
 -<<<<<<< HEAD
 .1
 -=======
 -1.0
 ->>>>>>> d09227afd58226ed6801a3029f468483e56e4ad1