commit 4f9d2d5919f39c161d0152411f9d9aa585d06e2f
Author: Christian Ehringfeld <c.ehringfeld@t-online.de>
Date:   Mon Aug 14 23:41:16 2017 +0200

    ...

diff --git a/src/entityinstancefactory.h b/src/entityinstancefactory.h
index 8acc65e..be9f1ff 100644
--- a/src/entityinstancefactory.h
+++ b/src/entityinstancefactory.h
@@ -36,11 +36,7 @@ class EntityInstanceFactory {
     static const QString extractEntityType(const QString &s);
     static Entity *newSuperClassInstance(const Entity *e);
     static Entity *createInstance(const QMetaObject *object);
-<<<<<<< HEAD
     static const QList<QSharedPointer<Entity>> castQVariantList(QVariant &list);
-=======
-    static QList<QSharedPointer<Entity>> castQVariantList(QVariant &list);
->>>>>>> parent of 2c89eb9... Merge branch 'seb' of ssh://synlos.net/entitymanager into dev
     static const QSharedPointer<Entity> castQVariant(QVariant &entity);
     static QStringList getRegisteredClasses();