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