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

Fix merge conflict

Browse source
This commit is contained in:
ChrisTerBeke 2018-12-03 15:58:25 +01:00
commit 24b75d781e
191 changed files with 7411 additions and 5513 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -344,7 +344,6 @@ class UM3OutputDevicePlugin(OutputDevicePlugin):
# Request more data if info is not complete
if not info.address:
Logger.log("d", "Trying to get address of %s", name)
info = zero_conf.get_service_info(service_type, name)
if info: