From daf9d0eaa7e762ad8571f91a266098631b1843e6 Mon Sep 17 00:00:00 2001
From: Petr Mrázek <peterix@gmail.com>
Date: Thu, 14 Dec 2017 02:22:20 +0100
Subject: NOISSUE do not override already loaded metadata entities with partial
 data

---
 api/logic/meta/BaseEntity.h | 1 -
 1 file changed, 1 deletion(-)

(limited to 'api/logic/meta/BaseEntity.h')

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;
-- 
cgit