diff --git a/.gitattributes b/.gitattributes index 7e800609e6c76c14893419965f1ce0ba400d9ace..17cbaa5eef5e0560c1036e745f1ebf62c078fa64 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1,2 @@ -CHANGELOG merge=union \ No newline at end of file +CHANGELOG merge=union +*.js.es6 gitlab-language=javascript