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