Fix wrong merge
This commit is contained in:
parent
eedd79bac7
commit
51b44bcc49
@ -734,7 +734,6 @@ EOF;
|
||||
$code }
|
||||
|
||||
EOF;
|
||||
>>>>>>> 2.8
|
||||
}
|
||||
|
||||
private function addNewInstance($id, Definition $definition, $return, $instantiation)
|
||||
|
Reference in New Issue
Block a user