3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-06 22:47:29 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix merge conflicts

Browse source 
CURA-4879
This commit is contained in:
Lipu Fei 2018-03-14 10:53:08 +01:00
commit 4cc2d882d3
786 changed files with 38319 additions and 23633 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cura/PrinterOutput/PrinterOutputController.py
View file

@ -6,7 +6,7 @@ from UM.Logger import Logger
MYPY = False
if MYPY:
from cura.PrinterOutput.PrintJobOutputModel import PrintJobOutputModel
from cura.PrinterOutput.ExtruderOuputModel import ExtruderOutputModel
from cura.PrinterOutput.ExtruderOutputModel import ExtruderOutputModel
from cura.PrinterOutput.PrinterOutputModel import PrinterOutputModel