change env

lautarobock · Dec 4, 2013 · f4fbc4e · f4fbc4e
1 parent a8a9ef0
commit f4fbc4e
Showing 1 changed file with 2 additions and 7 deletions.
diff --git a/public/js/env.js b/public/js/env.js
@@ -1,14 +1,9 @@
 (function() {
     var env = angular.module("env", []);
 
-<<<<<<< HEAD
-    env.constant("version",'0.15');
+    env.constant("version",'1.0.1-RC1');
     env.constant("env",'stage');
     env.constant("color",'success');
-=======
-    env.constant("version",'1.0.1-RC1');
-    env.constant("env",'dev');
-    env.constant("color",'warning');
->>>>>>> master
+
 
 })();