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/title-3-active.xpm | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'src/xfwm4/title-3-active.xpm')

diff --git a/src/xfwm4/title-3-active.xpm b/src/xfwm4/title-3-active.xpm
index 9719096..b2829b9 100644
--- a/src/xfwm4/title-3-active.xpm
+++ b/src/xfwm4/title-3-active.xpm
@@ -2,13 +2,8 @@
 static char * title_3_active_xpm[] = {
 "2 26 3 1",
 " 	c None",
-<<<<<<< HEAD
-".	c #eeeeee",
-"+	c #111111",
-=======
 ".	c #484848",
 "+	c #444444",
->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d
 "..",
 "++",
 "++",
-- 
cgit v1.2.3