symfony
diff --git a/‎src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
-1Lines changed: 0 additions & 1 deletion b/‎src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
-1Lines changed: 0 additions & 1 deletion
@@ -734,7 +734,6 @@ protected function synchronize{$this->camelize($id)}Service()
 $code    }
 
 EOF;
->>>>>>> 2.8
     }
 
     private function addNewInstance($id, Definition $definition, $return, $instantiation)
Original file line number	Diff line number	Diff line change
`@@ -734,7 +734,6 @@ protected function synchronize{$this->camelize($id)}Service()`
`734`	`734`	`$code }`
`735`	`735`
`736`	`736`	`EOF;`
`737`		`->>>>>>> 2.8`
`738`	`737`	`}`
`739`	`738`
`740`	`739`	`private function addNewInstance($id, Definition $definition, $return, $instantiation)`