From 51b44bcc4996a42aa994cc55fdb3266bcc021d34 Mon Sep 17 00:00:00 2001 From: Diego Saint Esteben Date: Thu, 11 Jun 2015 15:38:09 -0300 Subject: [PATCH] Fix wrong merge --- src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php index 401a9ce80e..af6b24d7d2 100644 --- a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php +++ b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php @@ -734,7 +734,6 @@ EOF; $code } EOF; ->>>>>>> 2.8 } private function addNewInstance($id, Definition $definition, $return, $instantiation)