1 files changed, 0 insertions, 14 deletions
diff --git a/src/declarative/qml/qmlcomponent.cpp b/src/declarative/qml/qmlcomponent.cpp
index 4a3f9b0..ca849ad 100644
--- a/src/declarative/qml/qmlcomponent.cpp
+++ b/src/declarative/qml/qmlcomponent.cpp
@@ -345,20 +345,6 @@ void QmlComponent::loadUrl(const QUrl &url)
 
         d->fromTypeData(data);
 
-<<<<<<< HEAD:src/declarative/qml/qmlcomponent.cpp
-=======
-        // Compile data
-        QmlCompiler compiler;
-        if(!compiler.compile(d->engine, parser, d->cc)) {
-            qWarning().nospace()
-#ifdef QML_VERBOSEERRORS_ENABLED
-                    << "QmlComponent: "
-#endif
-                    << compiler.errorDescription().toLatin1().constData() << " @"
-                    << d->name.toLatin1().constData() << ":"
-                    << compiler.errorLine();
-        }
->>>>>>> support both *.qml and *.whatever with autodetection. Some debug output, some fixes.:src/declarative/qml/qmlcomponent.cpp
     }
 
     emit statusChanged(status());