From 3b65b90de102b730c91841a6f93ff353844e2666 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A1vid=20Szab=C3=B3?= <david.szabo97@gmail.com>
Date: Wed, 31 Aug 2016 17:25:20 +0200
Subject: [PATCH] Fix package.json

---
 package.json | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 28038a9c..3dbebf18 100644
--- a/package.json
+++ b/package.json
@@ -51,12 +51,8 @@
     "karma-jasmine": "1.0.2",
     "karma-phantomjs-launcher": "0.2.3",
     "load-grunt-tasks": "3.5.0",
-<<<<<<< HEAD
-    "phantomjs": "1.9.19",
+    "phantomjs": "2.1.7",
     "phantomjs-polyfill-object-assign": "0.0.2"
-=======
-    "phantomjs": "2.1.7"
->>>>>>> adee70c... Update phantomjs to 2.1.7
   },
   "window": {
     "title": "Piskel",