diff options
| author | Ghostkeeper <rubend@tutanota.com> | 2022-01-31 19:08:56 +0300 |
|---|---|---|
| committer | Ghostkeeper <rubend@tutanota.com> | 2022-01-31 19:08:56 +0300 |
| commit | ee81326d6a25765c6e0707e1cf7a9ef550194185 (patch) | |
| tree | e3e91b185fda7f93aa6b5a75e2a1511499f8ecf0 /plugins/PerObjectSettingsTool | |
| parent | 6db4a55f6e597fd4a34ca2426225481d60f3474f (diff) | |
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.
Diffstat (limited to 'plugins/PerObjectSettingsTool')
| -rw-r--r-- | plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml b/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml index 943c58ce76..8bf39f6804 100644 --- a/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml +++ b/plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml @@ -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 |