diff options
Diffstat (limited to 'api/logic/meta/VersionList.h')
| -rw-r--r-- | api/logic/meta/VersionList.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/api/logic/meta/VersionList.h b/api/logic/meta/VersionList.h index e8016314..c4a2b757 100644 --- a/api/logic/meta/VersionList.h +++ b/api/logic/meta/VersionList.h @@ -80,7 +80,8 @@ public: // for usage only by parsers void setName(const QString &name); void setParentUid(const QString &parentUid); void setVersions(const QVector<VersionPtr> &versions); - void merge(const BaseEntity::Ptr &other) override; + void merge(const VersionListPtr &other); + void mergeFromIndex(const VersionListPtr &other); void parse(const QJsonObject &obj) override; signals: |