yopzey's picture
Resolved conflict by [keeping/deleting] .gitattributes
ec7fa94