merge things...

danibram · May 8, 2018 · d94241a · d94241a
2 parents 4444f2b + 8856c13
commit d94241a
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/package.json b/package.json
@@ -87,7 +87,11 @@
     "devDependencies": {
         "@types/chance": "^1.0.0",
         "@types/faker": "^4.1.2",
+<<<<<<< HEAD
         "@types/node": "^10.0.4",
+=======
+        "@types/node": "^10.0.3",
+>>>>>>> 8856c13576dc9983d2277e5663cc5951f50c20f2
         "ava": "^0.25.0",
         "babel-preset-stage-0": "^6.24.1",
         "codecov": "^3.0.1",