remove unrelated changes.

Author: makasim

pkg/enqueue-bundle/Tests/Functional/Events/AsyncListenerTest.php

@@ -20,9 +20,9 @@ protected function tearDown()
     {
         parent::tearDown();
 
-//<<<<<<< HEAD
+        //<<<<<<< HEAD
 //        static::$container = null;
-//=======
+        //=======
         /** @var AsyncListener $asyncListener */
         $asyncListener = static::$container->get('enqueue.events.async_listener');
 

pkg/enqueue-bundle/Tests/Functional/Events/AsyncProcessorTest.php

@@ -2,6 +2,7 @@
 
 namespace Enqueue\Bundle\Tests\Functional\Events;
 
+use Enqueue\AsyncEventDispatcher\AsyncListener;
 use Enqueue\AsyncEventDispatcher\AsyncProcessor;
 use Enqueue\Bundle\Tests\Functional\App\TestAsyncListener;
 use Enqueue\Bundle\Tests\Functional\App\TestAsyncSubscriber;
@@ -17,20 +18,16 @@
  */
 class AsyncProcessorTest extends WebTestCase
 {
-    protected function tearDown()
+    public function setUp()
     {
-        parent::tearDown();
+        parent::setUp();
 
-//<<<<<<< HEAD
-//        static::$container = null;
-//=======
         /** @var AsyncListener $asyncListener */
         $asyncListener = static::$container->get('enqueue.events.async_listener');
 
         $asyncListener->resetSyncMode();
         static::$container->get('test_async_subscriber')->calls = [];
         static::$container->get('test_async_listener')->calls = [];
-//>>>>>>> origin/master
     }
 
     public function testCouldBeGetFromContainerAsService()

pkg/enqueue-bundle/Tests/Functional/Events/AsyncSubscriberTest.php

@@ -16,20 +16,16 @@
  */
 class AsyncSubscriberTest extends WebTestCase
 {
-    protected function tearDown()
+    public function setUp()
     {
-        parent::tearDown();
+        parent::setUp();
 
-//<<<<<<< HEAD
-//        static::$container = null;
-//=======
         /** @var AsyncListener $asyncListener */
         $asyncListener = static::$container->get('enqueue.events.async_listener');
 
         $asyncListener->resetSyncMode();
         static::$container->get('test_async_subscriber')->calls = [];
         static::$container->get('test_async_listener')->calls = [];
-//>>>>>>> origin/master
     }
 
     public function testShouldNotCallRealSubscriberIfMarkedAsAsync()

pkg/enqueue/Client/Producer.php

@@ -9,12 +9,6 @@
 
 final class Producer implements ProducerInterface
 {
-    /**
-     * compatibility with 0.9x.
-     */
-    const TOPIC_09X = 'enqueue.topic';
-    const COMMAND_09X = 'enqueue.command';
-
     /**
      * @var DriverInterface
      */