From 65d3aa44802c740d06c19ebbc58a2e9f2732ee80 Mon Sep 17 00:00:00 2001
From: Ghostkeeper <rubend@tutanota.com>
Date: Mon, 3 Dec 2018 11:59:03 +0100
Subject: Fix broken sizes due to merged theme entry

Merge conflict went wrong, I think.

Contributes to issue CURA-5876.
---
 resources/qml/ActionPanel/SliceProcessWidget.qml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'resources/qml/ActionPanel/SliceProcessWidget.qml')

diff --git a/resources/qml/ActionPanel/SliceProcessWidget.qml b/resources/qml/ActionPanel/SliceProcessWidget.qml
index dee099bc88..1143bb4c1a 100644
--- a/resources/qml/ActionPanel/SliceProcessWidget.qml
+++ b/resources/qml/ActionPanel/SliceProcessWidget.qml
@@ -101,7 +101,7 @@ Column
         // Disable the slice process when
 
         width: parent.width
-        height: UM.Theme.getSize("action_panel_button").height
+        height: UM.Theme.getSize("action_button").height
         visible: !autoSlice
         Cura.PrimaryButton
         {
-- 
cgit v1.2.3