From 7369eabae53b5568102968081ed2250c2ce9fcfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs?= Date: Thu, 30 Jan 2020 23:48:09 -0500 Subject: clean files --- src/xfwm4/shade-active.xpm | 5 ----- 1 file changed, 5 deletions(-) (limited to 'src/xfwm4/shade-active.xpm') diff --git a/src/xfwm4/shade-active.xpm b/src/xfwm4/shade-active.xpm index 4c25113..369af98 100644 --- a/src/xfwm4/shade-active.xpm +++ b/src/xfwm4/shade-active.xpm @@ -2,15 +2,10 @@ static char * shade_prelight_xpm[] = { "24 26 4 1", " c None", -<<<<<<< HEAD -". c #111111", -"+ c #eeeeee", -======= ". c #444444", "+ c #eeeeee", "@ c #484848", "@@@@@@@@@@@@@@@@@@@@@@@@", ->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d "........................", "........................", "........................", -- cgit v1.2.3