3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-09 14:55:03 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix merge conflics

Browse source
This commit is contained in:
Jaime van Kessel 2022-02-17 15:07:48 +01:00
parent f682f56923
commit b5136ba70c
3 changed files with 1 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/qml/Actions.qml
View file

@ -488,6 +488,6 @@ Item
{
id: openMarketplaceAction
text: catalog.i18nc("@action:menu", "&Marketplace")
iconName: "plugins_browse"
icon.name: "plugins_browse"
}
}

5
resources/qml/Dialogs/AskOpenAsProjectOrModelsDialog.qml
View file

@ -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
{

5
resources/qml/Menus/RecentFilesMenu.qml
View file

@ -32,9 +32,4 @@ Cura.Menu
onObjectAdded: menu.insertItem(index, object)
onObjectRemoved: menu.removeItem(object)
}
Cura.AskOpenAsProjectOrModelsDialog
{
id: askOpenAsProjectOrModelsDialog
}
}