From de264f7b78345eb8a60ec6dd2948a4ef9805ee63 Mon Sep 17 00:00:00 2001
From: raveit65 <chat-to-me@raveit.de>
Date: Sat, 18 Oct 2014 14:44:23 +0200
Subject: BlackMate GTK3: fix further merge conflict correctly

---
 desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css b/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css
index 5a91c225..d1ff59cd 100644
--- a/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css
@@ -108,15 +108,7 @@
 	color: @theme_tooltip_fg_color;
 }
 
-<<<<<<< HEAD
-.grip {
-	background-color: transparent;
-	background-image: url("assets/resize-grip.svg");
-}
-
 .content-view.view.rubberband,
-=======
->>>>>>> 0958588... BlackMate GTK3: use an image as resize grip
 .view.rubberband,
 .rubberband {
 	background-color: alpha(@theme_selected_bg_color, 0.35);
-- 
cgit v1.2.1