mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-08-06 05:23:58 -06:00
Revert "fix merge conflict"
This reverts commitec03b012a7
, reversing changes made to2af33738d1
.
This commit is contained in:
parent
3ebefa4f8a
commit
4bffa6d90f
73 changed files with 1223 additions and 3054 deletions
|
@ -47,7 +47,7 @@ Item
|
|||
{
|
||||
id: extruderTargetTemperature
|
||||
text: Math.round(extruderModel.targetHotendTemperature) + "°C"
|
||||
font: UM.Theme.getFont("default_bold")
|
||||
font: UM.Theme.getFont("small")
|
||||
color: UM.Theme.getColor("text_inactive")
|
||||
anchors.right: parent.right
|
||||
anchors.rightMargin: UM.Theme.getSize("default_margin").width
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue