diff --git a/.gitattributes b/.gitattributes index ab791a4cd6c3a01c1442ccd12ae0c1ccb5123096..70cce05d2b561714d9fcbcf7785f4638747157fb 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1 @@ -CHANGELOG.md merge=union *.js.es6 gitlab-language=javascript