From 4e139ae7106718731d4c2bc0948c21aeec87112a Mon Sep 17 00:00:00 2001
From: Arjen Hiemstra <ahiemstra@heimr.nl>
Date: Mon, 15 Feb 2016 08:39:38 +0100
Subject: [PATCH] Fix minor error after rebase

---
 resources/qml/SaveButton.qml | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/resources/qml/SaveButton.qml b/resources/qml/SaveButton.qml
index a0d89bd4a9..c1be09d3c9 100644
--- a/resources/qml/SaveButton.qml
+++ b/resources/qml/SaveButton.qml
@@ -58,15 +58,9 @@ Rectangle {
         Rectangle{
             width: Math.max(parent.width * base.progress)
             height: parent.height
-<<<<<<< 041fa2b3592e015eebe779169c9d7f4565b3a788
-            color: UM.Theme.colors.progressbar_control
-            radius: UM.Theme.sizes.progressbar_radius.width
-            visible: base.backendState == 1 ? true : false
-=======
             color: UM.Theme.getColor("progressbar_control")
             radius: UM.Theme.getSize("progressbar_radius").width
-            visible: base.progress > 0.99 ? false : true
->>>>>>> Replace Theme property accessors with getThing calls
+            visible: base.backendState == 1 ? true : false
         }
     }