Fix wrong merge

2015-06-11 15:38:09 -03:00 · 2015-06-11 15:38:09 -03:00 · 51b44bcc49
commit 51b44bcc49
parent eedd79bac7
1 changed files with 0 additions and 1 deletions
--- 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)