Browse Source

Merge pull request #5824 from antograssiot/3.0

3.0 add missing backtick
Mark S. 11 years ago
parent
commit
d7c9ad714c
1 changed files with 1 additions and 1 deletions
  1. 1 1
      src/ORM/Marshaller.php

+ 1 - 1
src/ORM/Marshaller.php

@@ -399,7 +399,7 @@ class Marshaller
     }
 
     /**
-     * Merges each of the elements from `$data` into each of the entities in `$entities
+     * Merges each of the elements from `$data` into each of the entities in `$entities`
      * and recursively does the same for each of the association names passed in
      * `$options`. When merging associations, if an entity is not present in the parent
      * entity for a given association, a new one will be created.