From a09a1576878b8dd0e28522098be3efdc4f8ed140 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs?= Date: Thu, 30 Jan 2020 23:08:55 -0500 Subject: Revert "clean files" This reverts commit 13739e23e5a7fc4ff5414602434ef360a7eaef0e. --- src/xfwm4/shade-inactive.xpm | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/xfwm4/shade-inactive.xpm') diff --git a/src/xfwm4/shade-inactive.xpm b/src/xfwm4/shade-inactive.xpm index 933a1f8..e6381c8 100644 --- a/src/xfwm4/shade-inactive.xpm +++ b/src/xfwm4/shade-inactive.xpm @@ -2,10 +2,15 @@ static char * shade_prelight_xpm[] = { "24 26 4 1", " c None", +<<<<<<< HEAD +". c #111111", +"+ c #101010", +======= ". c #444444", "+ c #888888", "@ c #393939", "@@@@@@@@@@@@@@@@@@@@@@@@", +>>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d "........................", "........................", "........................", -- cgit v1.2.3