Resolve .gitattributes conflict before merge 318a2f1 verified xraijobsimulator commited on 9 days ago