From b5136ba70cf710667aeb26fb05c8f0b745b35656 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 17 Feb 2022 15:07:48 +0100 Subject: [PATCH] Fix merge conflics --- resources/qml/Actions.qml | 2 +- resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml | 5 ----- resources/qml/Menus/RecentFilesMenu.qml | 5 ----- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/resources/qml/Actions.qml b/resources/qml/Actions.qml index 77334d19c2..92c9051491 100644 --- a/resources/qml/Actions.qml +++ b/resources/qml/Actions.qml @@ -488,6 +488,6 @@ Item { id: openMarketplaceAction text: catalog.i18nc("@action:menu", "&Marketplace") - iconName: "plugins_browse" + icon.name: "plugins_browse" } } diff --git a/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml b/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml index 0ff56f5bea..3bd72bf68f 100644 --- a/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml +++ b/resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml @@ -5,14 +5,9 @@ import QtQuick 2.2 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.1 -<<<<<<< HEAD -import UM 1.3 as UM -import Cura 1.5 as Cura -======= import UM 1.5 as UM import Cura 1.0 as Cura ->>>>>>> e66628e2da80d38637b58288f5e478f8ae4a74ba UM.Dialog { diff --git a/resources/qml/Menus/RecentFilesMenu.qml b/resources/qml/Menus/RecentFilesMenu.qml index e0b3bfda0c..8f4f328927 100644 --- a/resources/qml/Menus/RecentFilesMenu.qml +++ b/resources/qml/Menus/RecentFilesMenu.qml @@ -32,9 +32,4 @@ Cura.Menu onObjectAdded: menu.insertItem(index, object) onObjectRemoved: menu.removeItem(object) } - - Cura.AskOpenAsProjectOrModelsDialog - { - id: askOpenAsProjectOrModelsDialog - } }