new version number

zhangxinxu · zhangxinxu · commit 700c0dccb7c0 · 2014-10-31T15:14:16.000+08:00
new version number -&gt; 1.1.1
diff --git a/package.json b/package.json
@@ -1,12 +1,7 @@
 {
   "name": "mobilebone",
-<<<<<<< HEAD
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Bone main for mobile web APP with a sigle page mode.",
-=======
-  "version": "1.0.0",
-  "description": "Bone for mobile web APP with a sigle page mode.",
->>>>>>> origin/develop
   "main": "src/mobilebone.js",
   "directories": {
     "test": "test"
diff --git a/src/mobilebone.js b/src/mobilebone.js
@@ -38,7 +38,7 @@
 	 *
 	 * @type string
 	**/
-	Mobilebone.VERSION = '1.1.0';
+	Mobilebone.VERSION = '1.1.1';
 	
 	/**
 	 * Whether bind events when dom ready

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@`
`38`	`38`	`*`
`39`	`39`	`* @type string`
`40`	`40`	`**/`
`41`		`- Mobilebone.VERSION = '1.1.0';`
	`41`	`+ Mobilebone.VERSION = '1.1.1';`
`42`	`42`
`43`	`43`	`/**`
`44`	`44`	`* Whether bind events when dom ready`