From 79c26f4db64ba904545b42488d534d01efd97b00 Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Thu, 8 Jun 2023 21:40:58 +0200 Subject: [PATCH] rebase --- .../AttributeGroupNamedArgumentManipulator.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/rules/Php80/NodeManipulator/AttributeGroupNamedArgumentManipulator.php b/rules/Php80/NodeManipulator/AttributeGroupNamedArgumentManipulator.php index dbea77b38d4..2575d735763 100644 --- 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; }