Merge branch '2.6'

This commit is contained in:
Ghostkeeper 2017-05-31 17:17:32 +02:00
commit 2fb7821972
No known key found for this signature in database
GPG Key ID: C5F96EE2BC0F7E75
2 changed files with 2 additions and 3 deletions

View File

@ -52,7 +52,6 @@ class UMOUpgradeSelection(MachineAction):
definition_changes_container.addMetaDataEntry("setting_version", CuraApplication.SettingVersion)
UM.Settings.ContainerRegistry.ContainerRegistry.getInstance().addContainer(definition_changes_container)
# Insert definition_changes between the definition and the variant
global_container_stack.insertContainer(-1, definition_changes_container)
global_container_stack.definitionChanges = definition_changes_container
return definition_changes_container