diff options
| author | Jesús <heckyel@hyperbola.info> | 2020-01-30 23:48:09 -0500 |
|---|---|---|
| committer | Jesús <heckyel@hyperbola.info> | 2020-01-30 23:48:09 -0500 |
| commit | 7369eabae53b5568102968081ed2250c2ce9fcfd (patch) | |
| tree | ef2e066b0f4a692db2547d0700cbfb3e88143bc6 /src/xfwm4/stick-pressed.xpm | |
| parent | a09a1576878b8dd0e28522098be3efdc4f8ed140 (diff) | |
| download | librix-7369eabae53b5568102968081ed2250c2ce9fcfd.tar.lz librix-7369eabae53b5568102968081ed2250c2ce9fcfd.tar.xz librix-7369eabae53b5568102968081ed2250c2ce9fcfd.zip | |
clean files
Diffstat (limited to 'src/xfwm4/stick-pressed.xpm')
| -rw-r--r-- | src/xfwm4/stick-pressed.xpm | 5 |
1 files changed, 0 insertions, 5 deletions
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 "........................", "........................", "........................", |