rebase

rectorphp · Jun 8, 2023 · 79c26f4 · 79c26f4
1 parent f655aa0
commit 79c26f4
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/rules/Php80/NodeManipulator/AttributeGroupNamedArgumentManipulator.php b/rules/Php80/NodeManipulator/AttributeGroupNamedArgumentManipulator.php
@@ -16,14 +16,9 @@ final class AttributeGroupNamedArgumentManipulator
      */
     private array $attributeDecorators = [];
 
-<<<<<<< HEAD
-    public function __construct(SensioParamConverterAttributeDecorator $sensioParamConverterAttributeDecorator)
-    {
-=======
     public function __construct(
         SensioParamConverterAttributeDecorator $sensioParamConverterAttributeDecorator,
     ) {
->>>>>>> 2edfc379be (make attribute groupr named explicit)
         $this->attributeDecorators[] = $sensioParamConverterAttributeDecorator;
     }