mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-15 02:37:49 -06:00
Fix merge conflicts with master
This commit is contained in:
commit
94e89ad4ac
89 changed files with 1283 additions and 928 deletions
|
@ -107,8 +107,9 @@ Item
|
|||
Cura.PrinterTypeLabel
|
||||
{
|
||||
id: printerTypeLabel
|
||||
text: Cura.MachineManager.getAbbreviatedMachineName(section)
|
||||
text: section
|
||||
anchors.verticalCenter: parent.verticalCenter //One default margin above and one below.
|
||||
autoFit: true
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue