diff options
Diffstat (limited to 'src/xfwm4/top-left-active.xpm')
| -rw-r--r-- | src/xfwm4/top-left-active.xpm | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/xfwm4/top-left-active.xpm b/src/xfwm4/top-left-active.xpm index ce7c343..675afd3 100644 --- a/src/xfwm4/top-left-active.xpm +++ b/src/xfwm4/top-left-active.xpm @@ -2,15 +2,9 @@ static char * top_left_active_xpm[] = { "2 26 4 1", " c None", -<<<<<<< HEAD -". c #eeeeee", -"+ c #eeeeee", -"@ c #111111", -======= ". c #484848", "+ c #343434", "@ c #444444", ->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d " .", ".+", ".@", |