From b92017a0c923585e25c0e5e7ebc8b2fe881c15d6 Mon Sep 17 00:00:00 2001
From: dorian <dorian@itsblue.de>
Date: Sat, 23 Mar 2019 09:36:05 +0100
Subject: [PATCH] fixed merge issue

---
 qml/Components/FancyButton.qml | 2 +-
 qml/Forms/FilterForm.qml       | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/qml/Components/FancyButton.qml b/qml/Components/FancyButton.qml
index 3855c65..1e49121 100644
--- a/qml/Components/FancyButton.qml
+++ b/qml/Components/FancyButton.qml
@@ -45,7 +45,7 @@ Button {
 
         control.width = control.size
         control.height = control.size
-        console.log("Button: size: " + control.size + " height: " + control.height + " width: " + control.width)
+        //console.log("Button: size: " + control.size + " height: " + control.height + " width: " + control.width)
     }
 
    background: Item {
diff --git a/qml/Forms/FilterForm.qml b/qml/Forms/FilterForm.qml
index 7fed3b6..3ca4897 100644
--- a/qml/Forms/FilterForm.qml
+++ b/qml/Forms/FilterForm.qml
@@ -159,11 +159,7 @@ Page {
 
                         background: Rectangle {
                             radius: 2
-<<<<<<< HEAD
                             color: classLetterCb.Material.dialogColor//app.style.style.backgroundColor
-=======
-                            color: classLetterCb.Material.dialogColor
->>>>>>> origin/master
 
                             layer.enabled: classLetterCb.enabled
 //                            layer.effect: ElevationEffect {