summaryrefslogtreecommitdiff
path: root/.gitattributes
blob: 4157440bf276155705982d02922016e7dd22a7a1 (plain)
1
CHANGELOG.md merge=union