mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-18 04:07:57 -06:00
Fix merge conflicts
This commit is contained in:
commit
d1e7648f0e
1 changed files with 1 additions and 0 deletions
|
@ -12,6 +12,7 @@ _renamed_settings = {
|
|||
} #type: Dict[str, str]
|
||||
_removed_settings = ["prime_tower_circular"] # type: List[str]
|
||||
|
||||
|
||||
## Upgrades configurations from the state they were in at version 4.1 to the
|
||||
# state they should be in at version 4.2.
|
||||
class VersionUpgrade41to42(VersionUpgrade):
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue