cs

Author: TomasVotruba

tests/ReturnTypeExtension/NodeGetAttributeTypeExtension/NodeGetAttributeTypeExtensionTest.php

@@ -20,11 +20,7 @@ public function testAsserts(string $assertType, string $file, mixed ...$args): v
     }
 
     /**
-<<<<<<< HEAD
      * @return Iterator<array<string, mixed>>
-=======
-     * @return Iterator<array<string, array<array<mixed>, mixed>>>
->>>>>>> cc7df543 ([tests] add known doc iterables)
      */
     public static function dataAsserts(): Iterator
     {

tests/Rules/Rector/PhpUpgradeImplementsMinPhpVersionInterfaceRule/PhpUpgradeImplementsMinPhpVersionInterfaceRuleTest.php

@@ -4,7 +4,6 @@
 
 namespace Symplify\PHPStanRules\Tests\Rules\Rector\PhpUpgradeImplementsMinPhpVersionInterfaceRule;
 
-use Rector\Php80\Rector\Class_\SomePhpFeatureRector;
 use Iterator;
 use PHPStan\Rules\Rule;
 use PHPStan\Testing\RuleTestCase;