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/top-right-inactive.xpm | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'src/xfwm4/top-right-inactive.xpm')

diff --git a/src/xfwm4/top-right-inactive.xpm b/src/xfwm4/top-right-inactive.xpm
index ccd454c..e847a56 100644
--- a/src/xfwm4/top-right-inactive.xpm
+++ b/src/xfwm4/top-right-inactive.xpm
@@ -2,15 +2,9 @@
 static char * top_right_inactive_xpm[] = {
 "2 26 4 1",
 " 	c None",
-<<<<<<< HEAD
-".	c #eeeeee",
-"+	c #111111",
-"@	c #111111",
-=======
 ".	c #393939",
 "+	c #303030",
 "@	c #444444",
->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d
 ". ",
 "+.",
 "@.",
-- 
cgit v1.2.3