From a09a1576878b8dd0e28522098be3efdc4f8ed140 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jes=C3=BAs?= <heckyel@hyperbola.info>
Date: Thu, 30 Jan 2020 23:08:55 -0500
Subject: Revert "clean files"

This reverts commit 13739e23e5a7fc4ff5414602434ef360a7eaef0e.
---
 src/xfwm4/title-1-active.xpm | 5 +++++
 1 file changed, 5 insertions(+)

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

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