From ed76ee716aa2fa44b3c7a6476cb12c012a6ef989 Mon Sep 17 00:00:00 2001
From: Michael <pinke@live.ru>
Date: Wed, 13 Mar 2019 01:53:41 +0300
Subject: [PATCH] merge fix

---
 package.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/package.json b/package.json
index c911ea3..1c7204c 100644
--- 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",