xraijobsimulator's picture
Resolve .gitattributes conflict before merge
817f179 verified