Jonathan Hodgson 83a047a8a3 Adds conflicts to git prompt config		2020-07-29 17:21:26 +01:00
..
bash	Shell config changes	2020-03-11 12:56:06 +00:00
shared	Organises things	2020-07-29 17:13:40 +01:00
zsh	Adds conflicts to git prompt config	2020-07-29 17:21:26 +01:00