diff options
38 files changed, 0 insertions, 190 deletions
diff --git a/src/xfwm4/maximize-toggled-active.xpm b/src/xfwm4/maximize-toggled-active.xpm index b6cd92d..99b2758 100644 --- a/src/xfwm4/maximize-toggled-active.xpm +++ b/src/xfwm4/maximize-toggled-active.xpm @@ -2,15 +2,10 @@ static char * maximize_toggled_prelight_xpm[] = { "24 26 4 1", " c None", -<<<<<<< HEAD -". c #111111", -"+ c #eeeeee", -======= ". c #444444", "+ c #eeeeee", "@ c #484848", "@@@@@@@@@@@@@@@@@@@@@@@@", ->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d "........................", "........................", "........................", diff --git a/src/xfwm4/maximize-toggled-inactive.xpm b/src/xfwm4/maximize-toggled-inactive.xpm index 6770b9d..f6c3b59 100644 --- a/src/xfwm4/maximize-toggled-inactive.xpm +++ b/src/xfwm4/maximize-toggled-inactive.xpm @@ -2,15 +2,10 @@ static char * maximize_toggled_prelight_xpm[] = { "24 26 4 1", " c None", -<<<<<<< HEAD -". c #111111", -"+ c #101010", -======= ". c #444444", "+ c #888888", "@ c #393939", "@@@@@@@@@@@@@@@@@@@@@@@@", ->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d "........................", "........................", "........................", diff --git a/src/xfwm4/maximize-toggled-prelight.xpm b/src/xfwm4/maximize-toggled-prelight.xpm index 6215afa..3b13774 100644 --- a/src/xfwm4/maximize-toggled-prelight.xpm +++ b/src/xfwm4/maximize-toggled-prelight.xpm @@ -2,15 +2,10 @@ static char * maximize_toggled_prelight_xpm[] = { "24 26 4 1", " c None", -<<<<<<< HEAD -". c #111111", -"+ c #e91e63 s active_color_1", -======= ". c #444444", "+ c #f0544c s active_color_1", "@ c #484848", "@@@@@@@@@@@@@@@@@@@@@@@@", ->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d "........................", "........................", "........................", diff --git a/src/xfwm4/maximize-toggled-pressed.xpm b/src/xfwm4/maximize-toggled-pressed.xpm index 6215afa..3b13774 100644 --- a/src/xfwm4/maximize-toggled-pressed.xpm +++ b/src/xfwm4/maximize-toggled-pressed.xpm @@ -2,15 +2,10 @@ static char * maximize_toggled_prelight_xpm[] = { "24 26 4 1", " c None", -<<<<<<< HEAD -". c #111111", -"+ c #e91e63 s active_color_1", -======= ". c #444444", "+ c #f0544c s active_color_1", "@ c #484848", "@@@@@@@@@@@@@@@@@@@@@@@@", ->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d "........................", "........................", "........................", 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 "........................", "........................", "........................", diff --git a/src/xfwm4/menu-inactive.xpm b/src/xfwm4/menu-inactive.xpm index a460884..e1cba46 100644 --- a/src/xfwm4/menu-inactive.xpm +++ b/src/xfwm4/menu-inactive.xpm @@ -2,11 +2,7 @@ static char * menu_inactive_xpm[] = { "24 16 2 1", " c None", -<<<<<<< HEAD -". c #111111", -======= ". c #444444", ->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d "........................", "........................", "........................", diff --git a/src/xfwm4/menu-prelight.xpm b/src/xfwm4/menu-prelight.xpm index 9368fc3..fecec03 100644 --- a/src/xfwm4/menu-prelight.xpm +++ b/src/xfwm4/menu-prelight.xpm @@ -2,11 +2,7 @@ static char * menu_prelight_xpm[] = { "24 16 2 1", " c None", -<<<<<<< HEAD -". c #111111", -======= ". c #444444", ->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d "........................", "........................", "........................", diff --git a/src/xfwm4/menu-pressed.xpm b/src/xfwm4/menu-pressed.xpm index c235750..a27021e 100644 --- a/src/xfwm4/menu-pressed.xpm +++ b/src/xfwm4/menu-pressed.xpm @@ -2,11 +2,7 @@ static char * menu_pressed_xpm[] = { "24 16 2 1", " c None", -<<<<<<< HEAD -". c #111111", -======= ". c #444444", ->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d "........................", "........................", "........................", diff --git a/src/xfwm4/shade-active.xpm b/src/xfwm4/shade-active.xpm index 4c25113..369af98 100644 --- a/src/xfwm4/shade-active.xpm +++ b/src/xfwm4/shade-active.xpm @@ -2,15 +2,10 @@ static char * shade_prelight_xpm[] = { "24 26 4 1", " c None", -<<<<<<< HEAD -". c #111111", -"+ c #eeeeee", -======= ". c #444444", "+ c #eeeeee", "@ c #484848", "@@@@@@@@@@@@@@@@@@@@@@@@", ->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d "........................", "........................", "........................", diff --git a/src/xfwm4/shade-inactive.xpm b/src/xfwm4/shade-inactive.xpm index e6381c8..933a1f8 100644 --- a/src/xfwm4/shade-inactive.xpm +++ b/src/xfwm4/shade-inactive.xpm @@ -2,15 +2,10 @@ static char * shade_prelight_xpm[] = { "24 26 4 1", " c None", -<<<<<<< HEAD -". c #111111", -"+ c #101010", -======= ". c #444444", "+ c #888888", "@ c #393939", "@@@@@@@@@@@@@@@@@@@@@@@@", ->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d "........................", "........................", "........................", diff --git a/src/xfwm4/shade-prelight.xpm b/src/xfwm4/shade-prelight.xpm index 0ce1b9f..539ff84 100644 --- a/src/xfwm4/shade-prelight.xpm +++ b/src/xfwm4/shade-prelight.xpm @@ -2,15 +2,10 @@ static char * shade_prelight_xpm[] = { "24 26 4 1", " c None", -<<<<<<< HEAD -". c #111111", -"+ c #e91e63 s active_color_1", -======= ". c #444444", "+ c #f0544c s active_color_1", "@ c #484848", "@@@@@@@@@@@@@@@@@@@@@@@@", ->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d "........................", "........................", "........................", diff --git a/src/xfwm4/shade-pressed.xpm b/src/xfwm4/shade-pressed.xpm index 0ce1b9f..539ff84 100644 --- a/src/xfwm4/shade-pressed.xpm +++ b/src/xfwm4/shade-pressed.xpm @@ -2,15 +2,10 @@ static char * shade_prelight_xpm[] = { "24 26 4 1", " c None", -<<<<<<< HEAD -". c #111111", -"+ c #e91e63 s active_color_1", -======= ". c #444444", "+ c #f0544c s active_color_1", "@ c #484848", "@@@@@@@@@@@@@@@@@@@@@@@@", ->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d "........................", "........................", "........................", diff --git a/src/xfwm4/shade-toggled-active.xpm b/src/xfwm4/shade-toggled-active.xpm index 707a4fb..098841f 100644 --- a/src/xfwm4/shade-toggled-active.xpm +++ b/src/xfwm4/shade-toggled-active.xpm @@ -2,15 +2,10 @@ static char * shade_toggled_prelight_xpm[] = { "24 26 4 1", " c None", -<<<<<<< HEAD -". c #111111", -"+ c #eeeeee", -======= ". c #444444", "+ c #eeeeee", "@ c #484848", "@@@@@@@@@@@@@@@@@@@@@@@@", ->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d "........................", "........................", "........................", diff --git a/src/xfwm4/shade-toggled-inactive.xpm b/src/xfwm4/shade-toggled-inactive.xpm index 3b29731..88a5b90 100644 --- a/src/xfwm4/shade-toggled-inactive.xpm +++ b/src/xfwm4/shade-toggled-inactive.xpm @@ -2,15 +2,10 @@ static char * shade_toggled_prelight_xpm[] = { "24 26 4 1", " c None", -<<<<<<< HEAD -". c #111111", -"+ c #101010", -======= ". c #444444", "+ c #888888", "@ c #393939", "@@@@@@@@@@@@@@@@@@@@@@@@", ->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d "........................", "........................", "........................", diff --git a/src/xfwm4/shade-toggled-prelight.xpm b/src/xfwm4/shade-toggled-prelight.xpm index c694177..1e5cb40 100644 --- a/src/xfwm4/shade-toggled-prelight.xpm +++ b/src/xfwm4/shade-toggled-prelight.xpm @@ -2,15 +2,10 @@ static char * shade_toggled_prelight_xpm[] = { "24 26 4 1", " c None", -<<<<<<< HEAD -". c #111111", -"+ c #e91e63 s active_color_1", -======= ". c #444444", "+ c #f0544c s active_color_1", "@ c #484848", "@@@@@@@@@@@@@@@@@@@@@@@@", ->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d "........................", "........................", "........................", diff --git a/src/xfwm4/shade-toggled-pressed.xpm b/src/xfwm4/shade-toggled-pressed.xpm index c694177..1e5cb40 100644 --- a/src/xfwm4/shade-toggled-pressed.xpm +++ b/src/xfwm4/shade-toggled-pressed.xpm @@ -2,15 +2,10 @@ static char * shade_toggled_prelight_xpm[] = { "24 26 4 1", " c None", -<<<<<<< HEAD -". c #111111", -"+ c #e91e63 s active_color_1", -======= ". c #444444", "+ c #f0544c s active_color_1", "@ c #484848", "@@@@@@@@@@@@@@@@@@@@@@@@", ->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d "........................", "........................", "........................", diff --git a/src/xfwm4/stick-active.xpm b/src/xfwm4/stick-active.xpm index d3dbc3b..665fd75 100644 --- a/src/xfwm4/stick-active.xpm +++ b/src/xfwm4/stick-active.xpm @@ -2,15 +2,10 @@ static char * stick_active_xpm[] = { "24 26 4 1", " c None", -<<<<<<< HEAD -". c #111111", -"+ c #eeeeee", -======= ". c #444444", "+ c #eeeeee", "@ c #484848", "@@@@@@@@@@@@@@@@@@@@@@@@", ->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d "........................", "........................", "........................", diff --git a/src/xfwm4/stick-inactive.xpm b/src/xfwm4/stick-inactive.xpm index 3822388..56f7fd2 100644 --- a/src/xfwm4/stick-inactive.xpm +++ b/src/xfwm4/stick-inactive.xpm @@ -2,15 +2,10 @@ static char * stick_toggled_prelight_xpm[] = { "24 26 4 1", " c None", -<<<<<<< HEAD -". c #111111", -"+ c #101010", -======= ". c #444444", "+ c #888888", "@ c #393939", "@@@@@@@@@@@@@@@@@@@@@@@@", ->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d "........................", "........................", "........................", diff --git a/src/xfwm4/stick-prelight.xpm b/src/xfwm4/stick-prelight.xpm index b16ae3d..612d0e6 100644 --- a/src/xfwm4/stick-prelight.xpm +++ b/src/xfwm4/stick-prelight.xpm @@ -2,15 +2,10 @@ static char * stick_toggled_prelight_xpm[] = { "24 26 4 1", " c None", -<<<<<<< HEAD -". c #111111", -"+ c #e91e63 s active_color_1", -======= ". c #444444", "+ c #f0544c s active_color_1", "@ c #484848", "@@@@@@@@@@@@@@@@@@@@@@@@", ->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d "........................", "........................", "........................", diff --git a/src/xfwm4/stick-pressed.xpm b/src/xfwm4/stick-pressed.xpm index b16ae3d..612d0e6 100644 --- a/src/xfwm4/stick-pressed.xpm +++ b/src/xfwm4/stick-pressed.xpm @@ -2,15 +2,10 @@ static char * stick_toggled_prelight_xpm[] = { "24 26 4 1", " c None", -<<<<<<< HEAD -". c #111111", -"+ c #e91e63 s active_color_1", -======= ". c #444444", "+ c #f0544c s active_color_1", "@ c #484848", "@@@@@@@@@@@@@@@@@@@@@@@@", ->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d "........................", "........................", "........................", diff --git a/src/xfwm4/stick-toggled-active.xpm b/src/xfwm4/stick-toggled-active.xpm index f11c2be..7abb8f6 100644 --- a/src/xfwm4/stick-toggled-active.xpm +++ b/src/xfwm4/stick-toggled-active.xpm @@ -2,15 +2,10 @@ static char * stick_toggled_active_xpm[] = { "24 26 4 1", " c None", -<<<<<<< HEAD -". c #111111", -"+ c #eeeeee", -======= ". c #444444", "+ c #eeeeee", "@ c #484848", "@@@@@@@@@@@@@@@@@@@@@@@@", ->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d "........................", "........................", "........................", diff --git a/src/xfwm4/stick-toggled-inactive.xpm b/src/xfwm4/stick-toggled-inactive.xpm index 7836cd1..a7161f9 100644 --- a/src/xfwm4/stick-toggled-inactive.xpm +++ b/src/xfwm4/stick-toggled-inactive.xpm @@ -2,15 +2,10 @@ static char * stick_toggled_prelight_xpm[] = { "24 26 4 1", " c None", -<<<<<<< HEAD -". c #111111", -"+ c #101010", -======= ". c #444444", "+ c #888888", "@ c #393939", "@@@@@@@@@@@@@@@@@@@@@@@@", ->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d "........................", "........................", "........................", diff --git a/src/xfwm4/stick-toggled-prelight.xpm b/src/xfwm4/stick-toggled-prelight.xpm index efa3c31..dafc7ef 100644 --- a/src/xfwm4/stick-toggled-prelight.xpm +++ b/src/xfwm4/stick-toggled-prelight.xpm @@ -2,15 +2,10 @@ static char * stick_toggled_prelight_xpm[] = { "24 26 4 1", " c None", -<<<<<<< HEAD -". c #111111", -"+ c #e91e63 s active_color_1", -======= ". c #444444", "+ c #f0544c s active_color_1", "@ c #484848", "@@@@@@@@@@@@@@@@@@@@@@@@", ->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d "........................", "........................", "........................", diff --git a/src/xfwm4/stick-toggled-pressed.xpm b/src/xfwm4/stick-toggled-pressed.xpm index efa3c31..dafc7ef 100644 --- a/src/xfwm4/stick-toggled-pressed.xpm +++ b/src/xfwm4/stick-toggled-pressed.xpm @@ -2,15 +2,10 @@ static char * stick_toggled_prelight_xpm[] = { "24 26 4 1", " c None", -<<<<<<< HEAD -". c #111111", -"+ c #e91e63 s active_color_1", -======= ". c #444444", "+ c #f0544c s active_color_1", "@ c #484848", "@@@@@@@@@@@@@@@@@@@@@@@@", ->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d "........................", "........................", "........................", diff --git a/src/xfwm4/title-1-active.xpm b/src/xfwm4/title-1-active.xpm index f0b5fe9..52fb899 100644 --- a/src/xfwm4/title-1-active.xpm +++ b/src/xfwm4/title-1-active.xpm @@ -2,13 +2,8 @@ static char * title_1_active_xpm[] = { "2 26 3 1", " c None", -<<<<<<< HEAD -". c #eeeeee", -"+ c #111111", -======= ". c #484848", "+ c #444444", ->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d "..", "++", "++", diff --git a/src/xfwm4/title-1-inactive.xpm b/src/xfwm4/title-1-inactive.xpm index 6a50564..212d7aa 100644 --- a/src/xfwm4/title-1-inactive.xpm +++ b/src/xfwm4/title-1-inactive.xpm @@ -2,13 +2,8 @@ static char * title_1_inactive_xpm[] = { "2 26 3 1", " c None", -<<<<<<< HEAD -". c #eeeeee", -"+ c #111111", -======= ". c #393939", "+ c #444444", ->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d "..", "++", "++", diff --git a/src/xfwm4/title-2-active.xpm b/src/xfwm4/title-2-active.xpm index 6341d93..7f234ff 100644 --- a/src/xfwm4/title-2-active.xpm +++ b/src/xfwm4/title-2-active.xpm @@ -2,13 +2,8 @@ static char * title_2_active_xpm[] = { "2 26 3 1", " c None", -<<<<<<< HEAD -". c #eeeeee", -"+ c #111111", -======= ". c #484848", "+ c #444444", ->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d "..", "++", "++", diff --git a/src/xfwm4/title-2-inactive.xpm b/src/xfwm4/title-2-inactive.xpm index 6077207..e5cabe3 100644 --- a/src/xfwm4/title-2-inactive.xpm +++ b/src/xfwm4/title-2-inactive.xpm @@ -2,13 +2,8 @@ static char * title_2_inactive_xpm[] = { "2 26 3 1", " c None", -<<<<<<< HEAD -". c #eeeeee", -"+ c #111111", -======= ". c #393939", "+ c #444444", ->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d "..", "++", "++", diff --git a/src/xfwm4/title-3-active.xpm b/src/xfwm4/title-3-active.xpm index 9719096..b2829b9 100644 --- a/src/xfwm4/title-3-active.xpm +++ b/src/xfwm4/title-3-active.xpm @@ -2,13 +2,8 @@ static char * title_3_active_xpm[] = { "2 26 3 1", " c None", -<<<<<<< HEAD -". c #eeeeee", -"+ c #111111", -======= ". c #484848", "+ c #444444", ->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d "..", "++", "++", 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 "..", "++", "++", diff --git a/src/xfwm4/title-4-active.xpm b/src/xfwm4/title-4-active.xpm index b07eb3d..707d2a5 100644 --- a/src/xfwm4/title-4-active.xpm +++ b/src/xfwm4/title-4-active.xpm @@ -2,13 +2,8 @@ static char * title_4_active_xpm[] = { "2 26 3 1", " c None", -<<<<<<< HEAD -". c #eeeeee", -"+ c #111111", -======= ". c #484848", "+ c #444444", ->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d "..", "++", "++", diff --git a/src/xfwm4/title-4-inactive.xpm b/src/xfwm4/title-4-inactive.xpm index 2154935..4a86d59 100644 --- a/src/xfwm4/title-4-inactive.xpm +++ b/src/xfwm4/title-4-inactive.xpm @@ -2,13 +2,8 @@ static char * title_4_inactive_xpm[] = { "2 26 3 1", " c None", -<<<<<<< HEAD -". c #eeeeee", -"+ c #111111", -======= ". c #393939", "+ c #444444", ->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d "..", "++", "++", diff --git a/src/xfwm4/title-5-active.xpm b/src/xfwm4/title-5-active.xpm index 3338ded..31316b8 100644 --- a/src/xfwm4/title-5-active.xpm +++ b/src/xfwm4/title-5-active.xpm @@ -2,13 +2,8 @@ static char * title_5_active_xpm[] = { "2 26 3 1", " c None", -<<<<<<< HEAD -". c #eeeeee", -"+ c #111111", -======= ". c #484848", "+ c #444444", ->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d "..", "++", "++", diff --git a/src/xfwm4/title-5-inactive.xpm b/src/xfwm4/title-5-inactive.xpm index e1ada24..aa33f4c 100644 --- a/src/xfwm4/title-5-inactive.xpm +++ b/src/xfwm4/title-5-inactive.xpm @@ -2,13 +2,8 @@ static char * title_5_inactive_xpm[] = { "2 26 3 1", " c None", -<<<<<<< HEAD -". c #eeeeee", -"+ c #111111", -======= ". c #393939", "+ c #444444", ->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d "..", "++", "++", 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 " .", ".+", ".@", diff --git a/src/xfwm4/top-left-inactive.xpm b/src/xfwm4/top-left-inactive.xpm index c35e9d3..0a922d8 100644 --- a/src/xfwm4/top-left-inactive.xpm +++ b/src/xfwm4/top-left-inactive.xpm @@ -2,15 +2,9 @@ static char * top_left_inactive_xpm[] = { "2 26 4 1", " c None", -<<<<<<< HEAD -". c #eeeeee", -"+ c #111111", -"@ c #111111", -======= ". c #393939", "+ c #303030", "@ c #444444", ->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d " .", ".+", ".@", diff --git a/src/xfwm4/top-right-active.xpm b/src/xfwm4/top-right-active.xpm index c6451f6..3ed6265 100644 --- a/src/xfwm4/top-right-active.xpm +++ b/src/xfwm4/top-right-active.xpm @@ -2,15 +2,9 @@ static char * top_right_active_xpm[] = { "2 26 4 1", " c None", -<<<<<<< HEAD -". c #eeeeee", -"+ c #eeeeee", -"@ c #111111", -======= ". c #484848", "+ c #343434", "@ c #444444", ->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d ". ", "+.", "@.", diff --git a/src/xfwm4/top-right-inactive.xpm b/src/xfwm4/top-right-inactive.xpm index ccd454c..e847a56 100644 --- a/src/xfwm4/top-right-inactive.xpm +++ b/src/xfwm4/top-right-inactive.xpm @@ -2,15 +2,9 @@ static char * top_right_inactive_xpm[] = { "2 26 4 1", " c None", -<<<<<<< HEAD -". c #eeeeee", -"+ c #111111", -"@ c #111111", -======= ". c #393939", "+ c #303030", "@ c #444444", ->>>>>>> 20c317abd13ec1b1bd1eef62707456f4e76b1f5d ". ", "+.", "@.", |