Ghostkeeper ee81326d6a Fix remaining merge conflicts ... - When both branches added Controls1 as OldControls, it's not marked as a merge conflict. But the merge removed the need for OldControls, so the import can be removed. - There was one instance where I had removed the OldControls for a checkbox but there it should remain since the checkboxes are updated in a separate ticket. Contributes to issue CURA-8684.		2022-01-31 17:08:56 +01:00
..
RecommendedAdhesionSelector.qml	Remove unneded styles import	2022-01-04 09:48:02 +01:00
RecommendedInfillDensitySelector.qml	Replace all old controls 1 comboboxes with UM.Combobox	2021-11-10 14:57:01 +01:00
RecommendedPrintSetup.qml	Remove unneded styles import	2022-01-04 09:48:02 +01:00
RecommendedQualityProfileSelector.qml	Remove unneded styles import	2022-01-04 09:48:02 +01:00
RecommendedSupportSelector.qml	Fix remaining merge conflicts	2022-01-31 17:08:56 +01:00