diff options
Diffstat (limited to 'api/logic/meta/Version.h')
| -rw-r--r-- | api/logic/meta/Version.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/api/logic/meta/Version.h b/api/logic/meta/Version.h index 61f253c6..debdf20a 100644 --- a/api/logic/meta/Version.h +++ b/api/logic/meta/Version.h @@ -84,7 +84,8 @@ public: /* con/des */ return m_data != nullptr; } - void merge(const std::shared_ptr<BaseEntity> &other) override; + void merge(const VersionPtr &other); + void mergeFromList(const VersionPtr &other); void parse(const QJsonObject &obj) override; QString localFilename() const override; |