Solved merge conflicts #1479 CURA-3321

This commit is contained in:
Jack Ha 2017-03-01 14:47:54 +01:00
commit f9a5dc885c
6 changed files with 72 additions and 210 deletions

View file

@ -306,18 +306,6 @@ UM.MainWindow
}
}
Legend
{
id: legend
anchors
{
top: parent.top
topMargin: UM.Theme.getSize("default_margin").height
right: sidebar.left
rightMargin: UM.Theme.getSize("default_margin").width
}
}
JobSpecs
{
id: jobSpecs