From fe6b08d0fd27a2b06425b00f825cee92a7d53f52 Mon Sep 17 00:00:00 2001
From: Sebastien Chopin <atinux@gmail.com>
Date: Tue, 11 Apr 2017 10:01:22 +0200
Subject: [PATCH] Fix package.json

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

diff --git a/package.json b/package.json
index fc903415c..eaa3b59ab 100644
--- a/package.json
+++ b/package.json
@@ -56,11 +56,7 @@
     "babel-core": "^6.24.0",
     "babel-loader": "^6.4.1",
     "babel-preset-es2015": "^6.24.0",
-<<<<<<< HEAD
-    "babel-preset-vue-app": "^1.1.0",
-=======
     "babel-preset-vue-app": "^1.1.1",
->>>>>>> 29bc1a868369997d6b817fb885c18558c66f1c0d
     "chokidar": "^1.6.1",
     "co": "^4.6.0",
     "compression": "^1.6.2",