3D-printing/Cura

Fork 0

mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-07 15:07:28 -06:00

Commit graph

Author	SHA1	Message	Date
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
Jaime van Kessel	2aa931cbca	Remove unneded styles import	2022-01-04 09:48:02 +01:00
Kostas Karmas	d972c505d0	Initial commit for the DL	2021-04-20 11:30:49 +02:00

Author

SHA1

Message

Date

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

Jaime van Kessel

2aa931cbca

Remove unneded styles import

2022-01-04 09:48:02 +01:00

Kostas Karmas

d972c505d0

Initial commit for the DL

2021-04-20 11:30:49 +02:00

3 commits