From 734b5613a55365ca2b67f443a5c9c9ae6014b326 Mon Sep 17 00:00:00 2001
From: Henry Oswald <henry.oswald@sharelatex.com>
Date: Thu, 2 Jun 2016 15:20:18 +0100
Subject: [PATCH] fix package.json

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

diff --git a/services/web/package.json b/services/web/package.json
index 23ac125ef1..add5a63be3 100644
--- a/services/web/package.json
+++ b/services/web/package.json
@@ -27,11 +27,7 @@
     "http-proxy": "^1.8.1",
     "jade": "~1.3.1",
     "ldapjs": "^0.7.1",
-<<<<<<< HEAD
     "logger-sharelatex": "git+https://github.com/sharelatex/logger-sharelatex.git#master",
-=======
-    "logger-sharelatex": "git+https://github.com/sharelatex/logger-sharelatex.git#v1.3.1",
->>>>>>> master
     "lynx": "0.1.1",
     "marked": "^0.3.3",
     "method-override": "^2.3.3",