From 7e82b3d66a0f9af9e9b14c3078f7aaaa906cf31b Mon Sep 17 00:00:00 2001
From: Laurent Lepinay <laurent.lepinay@thomsonreuters.com>
Date: Mon, 21 Sep 2015 15:36:59 +0200
Subject: [PATCH] jshint

---
 test/e2e/v2.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/e2e/v2.js b/test/e2e/v2.js
index 9da7a3a5..972abe57 100644
--- a/test/e2e/v2.js
+++ b/test/e2e/v2.js
@@ -110,7 +110,6 @@ describe('swagger 2.0 spec tests', function () {
     });
   });
 
-<<<<<<< HEAD
   ['root.id','root.username','root.firstName','root.lastName', 'root.email', 'root.password', 'root.phone', 'root.userStatus']
   .forEach(function (id) {
     it('should find a jsoneditor for user post with field: ' + id, function (done) {