Merge commit '05da73f332a5b1ed8b81c99dbca2da3c71b69364'

Conflicts: package.json
fvdm · Mar 18, 2016 · ede15e6 · ede15e6
2 parents 20015c1 + 05da73f
commit ede15e6
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/package.json b/package.json
@@ -19,7 +19,7 @@
     "httpreq": "0.4.x"
   },
   "devDependencies": {
-    "eslint": "1.x",
+    "eslint": "2.x",
     "dotest": "1.x"
   },
   "optionalDependencies": {},