Cura/resources/qml/Menus/ConfigurationMenu
Daniel Schiavini a1c252d3a2 Revert "Revert "fix merge conflict""
This reverts commit 4bffa6d90f.
2018-12-07 10:25:46 +01:00
..
AutoConfiguration.qml Revert "Revert "fix merge conflict"" 2018-12-07 10:25:46 +01:00
ConfigurationItem.qml Revert "Revert "fix merge conflict"" 2018-12-07 10:25:46 +01:00
ConfigurationListView.qml Revert "Revert "fix merge conflict"" 2018-12-07 10:25:46 +01:00
ConfigurationMenu.qml Revert "Revert "fix merge conflict"" 2018-12-07 10:25:46 +01:00
CustomConfiguration.qml Revert "Revert "fix merge conflict"" 2018-12-07 10:25:46 +01:00
PrintCoreConfiguration.qml Revert "Revert "fix merge conflict"" 2018-12-07 10:25:46 +01:00