Resolve .gitattributes conflict before merge 58c4324 verified xraijobsimulator commited on 9 days ago