jshint

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) {