Fix conflict

sonata-project · Dec 15, 2020 · 3f991f0 · 3f991f0
1 parent a341743
commit 3f991f0
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/src/DependencyInjection/Compiler/AddDependencyCallsCompilerPass.php b/src/DependencyInjection/Compiler/AddDependencyCallsCompilerPass.php
@@ -282,12 +282,7 @@ public function applyDefaults(ContainerBuilder $container, $serviceId, array $at
             'translator' => 'translator',
             'configuration_pool' => 'sonata.admin.pool',
             'route_generator' => 'sonata.admin.route.default_generator',
-<<<<<<< HEAD
             'validator' => 'validator', //NEXT_MAJOR: Remove this line
-=======
-            // NEXT_MAJOR: Remove this line.
-            'validator' => 'validator',
->>>>>>> e3f653f61... Improve AddDependencyCallsCompilerPass
             'security_handler' => 'sonata.admin.security.handler',
             'menu_factory' => 'knp_menu.factory',
             'route_builder' => 'sonata.admin.route.path_info'.