Alex 4cd5653ae4 Change git conflict style to zdiff3 ... Signed-off-by: forge <forge@pnyhf.eu>		2024-02-24 10:40:19 +01:00
..
config	Change git conflict style to zdiff3	2024-02-24 10:40:19 +01:00
ignore	Remove bash, add fish	2024-02-22 10:30:07 +01:00