summaryrefslogtreecommitdiff
path: root/.gitattributes
blob: ab791a4cd6c3a01c1442ccd12ae0c1ccb5123096 (plain)
1
2
CHANGELOG.md merge=union
*.js.es6 gitlab-language=javascript