Resolve conflicts

geoblink · Dec 30, 2019 · c25cbd0 · c25cbd0
2 parents ed811b4 + 82d280e
commit c25cbd0
Show file tree

Hide file tree

Showing 2 changed files with 623 additions and 379 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@geoblink/lodash-mixins",
-  "version": "1.4.3",
+  "version": "1.4.4",
   "description": "A collection of useful functions built on top of Lodash",
   "main": "dist/index.js",
   "files": [
@@ -44,7 +44,7 @@
     "coveralls": "^3.0.2",
     "es-check": "^5.0.0",
     "eslint": "^6.1.0",
-    "eslint-config-standard": "^13.0.1",
+    "eslint-config-standard": "^14.0.0",
     "eslint-plugin-import": "^2.16.0",
     "eslint-plugin-node": "^10.0.0",
     "eslint-plugin-promise": "^4.0.1",
@@ -56,8 +56,8 @@
     "mocha": "^6.1.1",
     "mocha-lcov-reporter": "^1.3.0",
     "npm-run-all": "^4.1.5",
-    "nyc": "^14.1.1",
-    "sinon": "^7.2.3",
+    "nyc": "^15.0.0",
+    "sinon": "^8.0.0",
     "sinon-chai": "^3.3.0",
     "source-map-support": "^0.5.10",
     "ts-node": "^8.0.2",