diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor #14953 Fix wrong merge (dosten)

Browse Source 
This PR was merged into the 3.0-dev branch.

Discussion
----------

Fix wrong merge

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| License       | MIT

Commits
-------

51b44bc Fix wrong merge
This commit is contained in:
Fabien Potencier 2015-06-11 21:06:25 +02:00
commit 2b858be7c4
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
View File

@ -734,7 +734,6 @@ EOF;
$code }
EOF;
>>>>>>> 2.8
}
private function addNewInstance($id, Definition $definition, $return, $instantiation)