3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-02 20:52:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' into feature_enable_disable_extruder

Browse source
This commit is contained in:
Jack Ha 2018-03-08 09:35:49 +01:00
commit 3b8d470323
9 changed files with 396 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cura/Settings/ContainerManager.py
View file

@ -391,8 +391,6 @@ class ContainerManager(QObject):
return ContainerManager.getInstance()
def _performMerge(self, merge_into, merge, clear_settings = True):
assert isinstance(merge, type(merge_into))
if merge == merge_into:
return