diff --git a/.gitattributes b/.gitattributes index 6bc5d6d47..30686c9c9 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,2 @@ -CHANGELOG merge=union +CHANGELOG.md merge=union *.rb.template gitlab-language=ruby