Cura/plugins/DigitalLibrary
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
..
resources Fix remaining merge conflicts 2022-01-31 17:08:56 +01:00
src Catch IndexError when logging errors 2021-11-23 19:04:33 +01:00
tests Update tests to test filter too 2021-07-13 16:24:21 +02:00
__init__.py Initial commit for the DL 2021-04-20 11:30:49 +02:00
plugin.json Increment version number of Digital Library plug-in to 1.1 2021-09-10 16:49:14 +02:00