diff options
Diffstat (limited to 'src/xfwm4/maximize-toggled-active.xpm')
| -rw-r--r-- | src/xfwm4/maximize-toggled-active.xpm | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/xfwm4/maximize-toggled-active.xpm b/src/xfwm4/maximize-toggled-active.xpm index 99b2758..b6cd92d 100644 --- a/src/xfwm4/maximize-toggled-active.xpm +++ b/src/xfwm4/maximize-toggled-active.xpm @@ -2,10 +2,15 @@ static char * maximize_toggled_prelight_xpm[] = { "24 26 4 1", " c None", +<<<<<<< HEAD +". c #111111", +"+ c #eeeeee", +======= ". c #444444", "+ c #eeeeee", "@ c #484848", "@@@@@@@@@@@@@@@@@@@@@@@@", +>>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d "........................", "........................", "........................", |