diff options
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitattributes b/.gitattributes index 17cbaa5eef5..ab791a4cd6c 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,2 @@ -CHANGELOG merge=union +CHANGELOG.md merge=union *.js.es6 gitlab-language=javascript |