From bb3727e936f63695daa59231ce7c18cb7e787159 Mon Sep 17 00:00:00 2001
From: Jacopo De Simoi <jacopods@gmail.com>
Date: Thu, 25 Jan 2018 16:43:19 -0500
Subject: [PATCH] Merge conflicts by hand

---
 kstyle/breezestyle.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/kstyle/breezestyle.cpp b/kstyle/breezestyle.cpp
index ef35107f..860856eb 100644
--- a/kstyle/breezestyle.cpp
+++ b/kstyle/breezestyle.cpp
@@ -5659,7 +5659,6 @@ namespace Breeze
             color = (documentMode&&!isQtQuickControl&&!hasAlteredBackground(widget)) ? palette.color( QPalette::Window ) : _helper->frameBackgroundColor( palette );
 
         } else {
-
             const auto normal( _helper->alphaColor( palette.color( QPalette::Shadow ), 0.2 ) );
             const auto hover( _helper->alphaColor( _helper->hoverColor( palette ), 0.2 ) );
             if( animated ) color = KColorUtils::mix( normal, hover, opacity );