resolves conflicts within the branch

bruce · Mar 12, 2018 · 1dce2b4 · 1dce2b4
1 parent 279c135
commit 1dce2b4
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -21,7 +21,8 @@
   ],
   "main": "./lib/temp",
   "dependencies": {
-    "rimraf": "~2.2.6"
+    "os-tmpdir": "^1.0.0",
+    "rimraf": "~2.6.2"
   },
   "keywords": [
     "temporary",