diff options
Diffstat (limited to 'api/logic/meta/BaseEntity.h')
| -rw-r--r-- | api/logic/meta/BaseEntity.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/api/logic/meta/BaseEntity.h b/api/logic/meta/BaseEntity.h index 4c74b1a7..9120b844 100644 --- a/api/logic/meta/BaseEntity.h +++ b/api/logic/meta/BaseEntity.h @@ -46,7 +46,6 @@ public: /* types */ public: virtual ~BaseEntity(); - virtual void merge(const std::shared_ptr<BaseEntity> &other) = 0; virtual void parse(const QJsonObject &obj) = 0; virtual QString localFilename() const = 0; |