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