kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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
This commit is contained in:
Dmitriy Zaporozhets 2016-11-16 11:36:27 +00:00
parent 0a3cafb289 5918943838
commit 05be65f373
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@ -1,2 +1 @@
CHANGELOG.md merge=union
*.js.es6 gitlab-language=javascript