xraijobsimulator's picture
Resolve .gitattributes conflict before merge
f84ed3a verified