Resolve .gitattributes conflict before merge 817f179 verified xraijobsimulator commited on 9 days ago