Cura/plugins/DigitalLibrary/resources/qml
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
..
CreateNewProjectPopup.qml Fix remaining merge conflicts 2022-01-31 17:08:56 +01:00
DigitalFactoryOpenDialog.qml Fix remaining merge conflicts 2022-01-31 17:08:56 +01:00
DigitalFactorySaveDialog.qml Fix remaining merge conflicts 2022-01-31 17:08:56 +01:00
LoadMoreProjectsCard.qml Initial commit for the DL 2021-04-20 11:30:49 +02:00
OpenProjectFilesPage.qml Use new table element for saving files as well 2022-01-25 18:48:45 +01:00
ProjectSummaryCard.qml Initial commit for the DL 2021-04-20 11:30:49 +02:00
SaveProjectFilesPage.qml Use new table element for saving files as well 2022-01-25 18:48:45 +01:00
SelectProjectPage.qml Fix remaining merge conflicts 2022-01-31 17:08:56 +01:00
Table.qml Remove outdated comment 2022-01-28 10:57:00 +01:00