Fixed merge conflict in package.json

RetireJS · Dec 13, 2016 · d0b4728 · d0b4728
2 parents 77f4645 + f5135be
commit d0b4728
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/package.json b/package.json
@@ -24,7 +24,7 @@
   "dependencies": {
     "retire": "~1.2.x",
     "async": "~1.5.x",
-    "request": "~2.x.x"
+    "request": "2.x.x"    
   },
   "devDependencies": {
     "grunt": "~1.0.x",