Jakob Gillich 5e5ecb7b6f fish: fix merge conflict ... patches got duplicated		2016-01-05 23:32:29 +01:00
..
builtin_status.patch
command-not-found.patch
default.nix	fish: fix merge conflict	2016-01-05 23:32:29 +01:00
etc_config.patch