QmlDesigner: fixed missed conflict marker

share/qtcreator/qmldesigner/propertyeditor/Qt/Layout.qml

@@ -3,11 +3,9 @@ import Bauhaus 1.0
 
 GroupBox {
     finished: finishedNotify;
-<<<<<<< HEAD:share/qtcreator/qmldesigner/propertyeditor/Qt/Layout.qml
+
     caption: "layout";
-=======
-    caption: "Layout";
->>>>>>> QmlDesigner.propertyEditor: ids have to be lower case:share/qtcreator/qmldesigner/propertyeditor/Qt/Layout.qml
+
 id: layout;
   enabled: anchorBackend.hasParent;