Resolve .gitattributes conflict before merge 060ffcf verified xraijobsimulator commited on 9 days ago