gykim
Resolve merge conflict in .gitattributes
edc3f73