diff options
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 "........................", "........................", "........................", |