fixed merge conflict

Author: kazu69

package.json

@@ -27,7 +27,7 @@
   },
   "devDependencies": {
     "grunt": "^1.0.1",
-    "grunt-contrib-jshint": "^1.0.0"
+    "grunt-contrib-jshint": "^1.1.0"
   },
   "peerDependencies": {
     "grunt": ">=0.4.0"