summaryrefslogtreecommitdiffstats
path: root/.gitattributes
blob: a19ade077d36b05ff659abf5bcbd8a9723b96495 (plain)
1
CHANGELOG.md merge=union