Fix bad merge

mochajs · Dec 27, 2018 · 8d42df3 · 8d42df3
1 parent 7a17c9a
commit 8d42df3
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/test/integration/hook-err.spec.js b/test/integration/hook-err.spec.js
@@ -16,16 +16,11 @@ describe('hook error handling', function() {
 
   describe('before hook error tip', function() {
     before(run('hooks/before-hook-error-tip.fixture.js', onlyErrorTitle()));
-<<<<<<< HEAD
-    it('should verify results', function() {
-      expect(lines, 'to equal', ['1) spec 2', '"before all" hook:']);
-=======
     it('should verify results', function () {
       assert.deepEqual(
         lines,
         ['1) spec 2', '"before all" hook for "skipped":']
       );
->>>>>>> Update hook error tests so error tip & nested error are consistent
     });
   });