diff options
| author | Jesús <heckyel@hyperbola.info> | 2020-01-30 23:07:14 -0500 |
|---|---|---|
| committer | Jesús <heckyel@hyperbola.info> | 2020-01-30 23:07:14 -0500 |
| commit | 13739e23e5a7fc4ff5414602434ef360a7eaef0e (patch) | |
| tree | 3dfe9cef07ed230bac96fa28c3fed21f284fdac9 /src/xfwm4/maximize-toggled-inactive.xpm | |
| parent | 5c34ef170bcc8fbe64d9784ad1498dca31cd88ae (diff) | |
| download | librix-13739e23e5a7fc4ff5414602434ef360a7eaef0e.tar.lz librix-13739e23e5a7fc4ff5414602434ef360a7eaef0e.tar.xz librix-13739e23e5a7fc4ff5414602434ef360a7eaef0e.zip | |
clean files
Diffstat (limited to 'src/xfwm4/maximize-toggled-inactive.xpm')
| -rw-r--r-- | src/xfwm4/maximize-toggled-inactive.xpm | 5 |
1 files changed, 0 insertions, 5 deletions
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 "........................", "........................", "........................", |