diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-11-16 11:36:27 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-11-16 11:36:27 +0000 |
| commit | 05be65f3731ebbe569c51a78ef72e30bf26aa8d0 (patch) | |
| tree | cc2531602d556fbe551010825e7cb5c53502a790 | |
| parent | 0a3cafb2895bef3577e2b9ca09c4eb8bdb8565fa (diff) | |
| parent | 59189438388191c044c0697d5bfb571693d95978 (diff) | |
| download | gitlab-ce-05be65f3731ebbe569c51a78ef72e30bf26aa8d0.tar.gz | |
Merge branch 'rs-disable-changelog-merge' into 'master'
Remove gitattribute entry for CHANGELOG.md
This should no longer be necessary now that we've got automatic changelogs!
See merge request !7479
| -rw-r--r-- | .gitattributes | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitattributes b/.gitattributes index ab791a4cd6c..70cce05d2b5 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1 @@ -CHANGELOG.md merge=union *.js.es6 gitlab-language=javascript |