minor #14953 Fix wrong merge (dosten)
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:
commit
2b858be7c4
@ -734,7 +734,6 @@ EOF;
|
||||
$code }
|
||||
|
||||
EOF;
|
||||
>>>>>>> 2.8
|
||||
}
|
||||
|
||||
private function addNewInstance($id, Definition $definition, $return, $instantiation)
|
||||
|
Reference in New Issue
Block a user