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

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

(limited to 'src/xfwm4/maximize-toggled-inactive.xpm')

diff --git a/src/xfwm4/maximize-toggled-inactive.xpm b/src/xfwm4/maximize-toggled-inactive.xpm
index 6770b9d..f6c3b59 100644
--- a/src/xfwm4/maximize-toggled-inactive.xpm
+++ b/src/xfwm4/maximize-toggled-inactive.xpm
@@ -2,15 +2,10 @@
 static char * maximize_toggled_prelight_xpm[] = {
 "24 26 4 1",
 " 	c None",
-<<<<<<< HEAD
-".	c #111111",
-"+	c #101010",
-=======
 ".	c #444444",
 "+	c #888888",
 "@	c #393939",
 "@@@@@@@@@@@@@@@@@@@@@@@@",
->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d
 "........................",
 "........................",
 "........................",
-- 
cgit v1.2.3