diff options
| author | Jesús <heckyel@hyperbola.info> | 2020-01-30 23:08:55 -0500 |
|---|---|---|
| committer | Jesús <heckyel@hyperbola.info> | 2020-01-30 23:08:55 -0500 |
| commit | a09a1576878b8dd0e28522098be3efdc4f8ed140 (patch) | |
| tree | dbc2e9e1e17c17e351d53a224ecb99713dffebe1 /src/xfwm4/maximize-toggled-active.xpm | |
| parent | 13739e23e5a7fc4ff5414602434ef360a7eaef0e (diff) | |
| download | librix-a09a1576878b8dd0e28522098be3efdc4f8ed140.tar.lz librix-a09a1576878b8dd0e28522098be3efdc4f8ed140.tar.xz librix-a09a1576878b8dd0e28522098be3efdc4f8ed140.zip | |
Revert "clean files"
This reverts commit 13739e23e5a7fc4ff5414602434ef360a7eaef0e.
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 "........................", "........................", "........................", |