merge fix

houd1ni · Mar 12, 2019 · ed76ee7 · ed76ee7
1 parent 4675788
commit ed76ee7
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -67,11 +67,7 @@
  "fela-plugin-unit": "*"
  },
  "devDependencies": {
-<<<<<<< HEAD
  "@types/node": "^11.11.2",
-=======
- "@types/node": "^11.11.1",
->>>>>>> 3cf1afa25e4527aab314661cd309c164efc8d34f
  "ava": "^1.3.1",
  "codecov": "^3.2.0",
  "cross-env": "^5.2.0",