style: bad merge

Author: soyuka

tests/Fixtures/app/AppKernel.php

@@ -239,8 +239,6 @@ class_exists(NativePasswordHasher::class) ? 'password_hashers' : 'encoders' => [
         $metadataBackwardCompatibilityLayer = (bool) ($_SERVER['EVENT_LISTENERS_BACKWARD_COMPATIBILITY_LAYER'] ?? false);
         $rfc7807CompliantErrors = (bool) ($_SERVER['RFC_7807_COMPLIANT_ERRORS'] ?? true);
 
-        extra_properties:
-
         $c->prependExtensionConfig('api_platform', [
             'mapping' => [
                 'paths' => ['%kernel.project_dir%/../TestBundle/Resources/config/api_resources'],