3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-21 21:58:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 16

Fix remaining merge conflicts

Browse source 
- 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.
This commit is contained in:
Ghostkeeper 2022-01-31 17:08:56 +01:00
parent 6db4a55f6e
commit ee81326d6a
No known key found for this signature in database
GPG key ID: D2A8871EE34EC59A
11 changed files with 8 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

1
plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml
View file

@ -3,7 +3,6 @@
import QtQuick 2.2
import QtQuick.Controls 2.15
import QtQuick.Controls 1.2 as OldControls
import QtQuick.Controls.Styles 1.2
import UM 1.5 as UM