be better

zhangxinxu · zhangxinxu · commit c489b8ef6bb7 · 2014-10-30T20:11:10.000+08:00
be better
diff --git a/src/mobilebone.js b/src/mobilebone.js
@@ -38,11 +38,7 @@
 	 *
 	 * @type string
 	**/
-<<<<<<< HEAD
 	Mobilebone.VERSION = '1.1.0';
-=======
-	Mobilebone.VERSION = '1.0.0';
->>>>>>> origin/develop
 	
 	/**
 	 * Whether bind events when dom ready
