diff options
author | Jesús <heckyel@hyperbola.info> | 2020-01-30 23:48:09 -0500 |
---|---|---|
committer | Jesús <heckyel@hyperbola.info> | 2020-01-30 23:48:09 -0500 |
commit | 7369eabae53b5568102968081ed2250c2ce9fcfd (patch) | |
tree | ef2e066b0f4a692db2547d0700cbfb3e88143bc6 /src/xfwm4/menu-active.xpm | |
parent | a09a1576878b8dd0e28522098be3efdc4f8ed140 (diff) | |
download | librix-7369eabae53b5568102968081ed2250c2ce9fcfd.tar.lz librix-7369eabae53b5568102968081ed2250c2ce9fcfd.tar.xz librix-7369eabae53b5568102968081ed2250c2ce9fcfd.zip |
clean files
Diffstat (limited to 'src/xfwm4/menu-active.xpm')
-rw-r--r-- | src/xfwm4/menu-active.xpm | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/xfwm4/menu-active.xpm b/src/xfwm4/menu-active.xpm index 12e27f2..89a9597 100644 --- a/src/xfwm4/menu-active.xpm +++ b/src/xfwm4/menu-active.xpm @@ -2,11 +2,7 @@ static char * menu_active_xpm[] = { "24 16 2 1", " c None", -<<<<<<< HEAD -". c #111111", -======= ". c #444444", ->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d "........................", "........................", "........................", |