Sontran0108
Resolve merge conflict in .gitattributes
fec7816