Skip to content

Commit d3b2758

Browse files
author
Mark Berube
committed
AC-970: Adjusting dependency confusion behavior
2 parents 0f15505 + d51555f commit d3b2758

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

src/Plugin.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,10 @@ class Plugin implements PluginInterface, EventSubscriberInterface
4444
*/
4545
private $versionSelector;
4646

47+
<<<<<<< HEAD
48+
=======
49+
50+
>>>>>>> d51555f7f8029c965c594c33e189a0857da9f783
4751
/**
4852
* @var array
4953
*/

0 commit comments

Comments
 (0)