Merge pull request #820 from prey/Fix/test-trigger-diff

remove difference cause by merge in test trigger.notgithub.js
prey · Jul 26, 2023 · f1a9f34 · f1a9f34
2 parents 1ebc9d5 + 03c709a
commit f1a9f34
Showing 1 changed file with 0 additions and 13 deletions.
diff --git a/test/lib/agent/actions/triggers.notgithub.js b/test/lib/agent/actions/triggers.notgithub.js
@@ -400,19 +400,6 @@ describe('triggers', () => {
             spy_logger2.getCall(0).args[0].should.containEql('Persisting action for');
             done();
           })
-
-<<<<<<< HEAD:test/lib/agent/actions/triggers.notgithub.js
-=======
-           // it('does not executes again', (done) => {
-          //   clock.tick(2000);
-          //   triggers.start(id, () => {
-          //     clock.tick(500);
-          //     spy_perform.notCalled.should.be.equal(true);
-          //     done();
-          //   })
-          // })
->>>>>>> master:test/lib/agent/actions/triggers.js
-
         })
       })
     });