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

resolve conflict

Browse source
This commit is contained in:
Mark 2018-02-09 11:30:56 +01:00
parent e7e476cb15
commit b52bf6decf
17 changed files with 75 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

4
plugins/UltimakerMachineActions/UMOCheckupMachineAction.qml
View file

@ -180,7 +180,7 @@ Cura.MachineAction
height: childrenRect.height
anchors.top: nozzleTempLabel.top
anchors.left: bedTempStatus.right
anchors.leftMargin: UM.Theme.getSize("default_margin").width/2
anchors.leftMargin: Math.floor(UM.Theme.getSize("default_margin").width/2)
visible: checkupMachineAction.usbConnected
Button
{
@ -241,7 +241,7 @@ Cura.MachineAction
height: childrenRect.height
anchors.top: bedTempLabel.top
anchors.left: bedTempStatus.right
anchors.leftMargin: UM.Theme.getSize("default_margin").width/2
anchors.leftMargin: Math.floor(UM.Theme.getSize("default_margin").width/2)
visible: checkupMachineAction.usbConnected && manager.hasHeatedBed
Button
{