diff options
Diffstat (limited to 'src/client/ObjectModel.cpp')
| -rw-r--r-- | src/client/ObjectModel.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/client/ObjectModel.cpp b/src/client/ObjectModel.cpp index e41be6c9..6c64735d 100644 --- a/src/client/ObjectModel.cpp +++ b/src/client/ObjectModel.cpp @@ -83,7 +83,7 @@ ObjectModel::polyphonic() const /** Merge the data of @a model with self, as much as possible. * * This will merge the two models, but with any conflict take the value in - * @a model as correct. The paths of the two models MUST be equal. + * @a o as correct. The paths of the two models MUST be equal. */ void ObjectModel::set(SharedPtr<ObjectModel> o) |