From 7369eabae53b5568102968081ed2250c2ce9fcfd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jes=C3=BAs?= <heckyel@hyperbola.info>
Date: Thu, 30 Jan 2020 23:48:09 -0500
Subject: clean files

---
 src/xfwm4/stick-toggled-pressed.xpm | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'src/xfwm4/stick-toggled-pressed.xpm')

diff --git a/src/xfwm4/stick-toggled-pressed.xpm b/src/xfwm4/stick-toggled-pressed.xpm
index efa3c31..dafc7ef 100644
--- a/src/xfwm4/stick-toggled-pressed.xpm
+++ b/src/xfwm4/stick-toggled-pressed.xpm
@@ -2,15 +2,10 @@
 static char * stick_toggled_prelight_xpm[] = {
 "24 26 4 1",
 " 	c None",
-<<<<<<< HEAD
-".	c #111111",
-"+	c #e91e63 s active_color_1",
-=======
 ".	c #444444",
 "+	c #f0544c s active_color_1",
 "@	c #484848",
 "@@@@@@@@@@@@@@@@@@@@@@@@",
->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d
 "........................",
 "........................",
 "........................",
-- 
cgit v1.2.3