AC-970: Adjusting dependency confusion behavior

Mark Berube · Mark Berube · commit 44120e272554 · 2021-09-22T15:01:25.000-05:00
diff --git a/src/Plugin.php b/src/Plugin.php
@@ -43,11 +43,7 @@ class Plugin implements PluginInterface, EventSubscriberInterface
      * @var Version
      */
     private $versionSelector;
-
-<<<<<<< HEAD
-=======
-
->>>>>>> d51555f7f8029c965c594c33e189a0857da9f783
+    
     /**
      * @var array
      */
