commit 77cccf8a38d8f477353c51770b7f85b0742c89a6
Author: Christian Ehringfeld <c.ehringfeld@t-online.de>
Date:   Sun Jan 10 22:21:21 2016 +0100

    what a mess

diff --git a/src/attributeresolver.cpp b/src/attributeresolver.cpp
index 3f49cec..afc58fd 100644
--- a/src/attributeresolver.cpp
+++ b/src/attributeresolver.cpp
@@ -130,13 +130,10 @@ Attribute *AttributeResolver::resolveExplicitAttribute(const QSharedPointer<Enti
     return a;
 }
 
-<<<<<<< HEAD
 QSharedPointer<QueryBuilder> AttributeResolver::getQb() const {
     return qb;
 }
 
-=======
->>>>>>> master
 bool AttributeResolver::containsAttribute(const QString &className,
         const QString &attribute) const {
     bool r = false;
@@ -149,18 +146,6 @@ bool AttributeResolver::containsAttribute(const QString &className,
     return r;
 }
 
-Attribute *AttributeResolver::resolveAttribute(const QSharedPointer<Entity> &classObj,
-        const QString &attribute, QSharedPointer<Entity> related) {
-    Attribute *attr = nullptr;
-    if(this->containsAttribute(classObj->getClassname(), attribute)) {
-        attr = this->attributes.value(classObj->getClassname()).value(attribute);
-    } else {
-        attr = this->resolveExplicitAttribute(classObj, attribute, related);
-        this->addAttribute(classObj->getClassname(), attr);
-    }
-    return attr;
-}
-
 Attribute *AttributeResolver::resolveAttribute(const QString &className,
         const QString &attribute, const QString related) {
     Attribute *attr = nullptr;