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

Fix merge conflicts

Browse source
This commit is contained in:
Lipu Fei 2019-03-21 09:31:24 +01:00
parent 85a3b54111
commit aa1ad9a93d
1 changed files with 0 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py
View file

@ -27,17 +27,10 @@ from UM.Version import Version
from . import ClusterUM3OutputDevice, LegacyUM3OutputDevice from . import ClusterUM3OutputDevice, LegacyUM3OutputDevice
from .Cloud.CloudOutputDeviceManager import CloudOutputDeviceManager from .Cloud.CloudOutputDeviceManager import CloudOutputDeviceManager
<<<<<<< HEAD
if TYPE_CHECKING: if TYPE_CHECKING:
from cura.Settings.GlobalStack import GlobalStack from cura.Settings.GlobalStack import GlobalStack
from UM.OutputDevice.OutputDevicePlugin import OutputDevicePlugin from UM.OutputDevice.OutputDevicePlugin import OutputDevicePlugin
=======
from typing import Optional, TYPE_CHECKING
if TYPE_CHECKING:
from cura.Settings.GlobalStack import GlobalStack
>>>>>>> origin/WIP_onboarding
i18n_catalog = i18nCatalog("cura") i18n_catalog = i18nCatalog("cura")