James Lakin 6e6da2c276 Tweak locale to respect singular conflicting file message in P… (#10177) ... Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com>		2020-02-07 17:38:18 +01:00
..
gitignore	Delete conflicting file (#9526)	2019-12-28 10:43:03 +00:00
label
license
locale	Tweak locale to respect singular conflicting file message in P… (#10177)	2020-02-07 17:38:18 +01:00
readme