From f370d170df717fa7168f547b6a2012c993c16743 Mon Sep 17 00:00:00 2001
From: zmagod <zmago_devetak@yahoo.com>
Date: Mon, 9 Oct 2017 09:27:25 +0200
Subject: [PATCH] fix package.json

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

diff --git a/package.json b/package.json
index b71c0a2d6..85531bb67 100644
--- a/package.json
+++ b/package.json
@@ -68,11 +68,8 @@
     "react-bootstrap-table": "^4.0.0",
     "react-bootstrap-timezone-picker": "^1.0.11",
     "react-data-grid": "^2.0.2",
-<<<<<<< HEAD
-=======
     "react-tagsinput": "^3.17.0",
     "react-transition-group": "^2.2.0",
->>>>>>> fcea55c2a102470bd4520ea0ac1ef771710c17d8
     "react-dom": "^15.6.1",
     "react-intl": "^2.3.0",
     "react-intl-redux": "^0.6.0",