diff options
Diffstat (limited to 'src/xfwm4/title-1-active.xpm')
| -rw-r--r-- | src/xfwm4/title-1-active.xpm | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/xfwm4/title-1-active.xpm b/src/xfwm4/title-1-active.xpm index 52fb899..f0b5fe9 100644 --- a/src/xfwm4/title-1-active.xpm +++ b/src/xfwm4/title-1-active.xpm @@ -2,8 +2,13 @@ static char * title_1_active_xpm[] = { "2 26 3 1", " c None", +<<<<<<< HEAD +". c #eeeeee", +"+ c #111111", +======= ". c #484848", "+ c #444444", +>>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d "..", "++", "++", |