3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-15 02:37:49 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge branch 'master' of github.com:Ultimaker/Cura into replace_controls_1_for_controls_2

Browse source
This commit is contained in:
Jaime van Kessel 2022-02-17 15:02:03 +01:00
commit f682f56923
371 changed files with 41465 additions and 33048 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -5,8 +5,14 @@ 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
{
@ -84,7 +90,7 @@ UM.Dialog
wrapMode: Text.WordWrap
}
CheckBox
UM.CheckBox
{
id: rememberChoiceCheckBox
text: catalog.i18nc("@text:window", "Remember my choice")