qa: resolve merge conflict in EventManagerTest

Missed previously when rebasing Signed-off-by: Matthew Weier O'Phinney <[email protected]>
laminas · Feb 10, 2021 · 060fcaf · 060fcaf
1 parent 373452e
commit 060fcaf
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/test/EventManagerTest.php b/test/EventManagerTest.php
@@ -640,7 +640,6 @@ public function testDetachedWildcardListenerWillNotBeTriggered($dependencies)
         }
     }
 
-<<<<<<< HEAD
     public function testNotPassingEventNameToDetachDetachesListenerFromAllEvents()
     {
         $eventNames = ['foo', 'bar'];
@@ -662,8 +661,6 @@ public function testNotPassingEventNameToDetachDetachesListenerFromAllEvents()
         }
     }
 
-=======
->>>>>>> 22d9703... qa: ensure tests pass, and BC breaks identified and removed
     public function testCanDetachASingleListenerFromAnEventWithMultipleListeners()
     {
         $listener = function ($e) {