mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-12-11 16:00:47 -07:00
Solved merge conflicts #1479 CURA-3321
This commit is contained in:
commit
f9a5dc885c
6 changed files with 72 additions and 210 deletions
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue