Skip to content
Snippets Groups Projects
Commit 05be65f3 authored by Dmytro Zaporozhets (DZ)'s avatar Dmytro Zaporozhets (DZ) :palm_tree:
Browse files

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
parents 0a3cafb2 59189438
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 0 additions and 1 deletion
.gitattributes
+ 0
− 1
View file @ 05be65f3
CHANGELOG.md merge=union
*.js.es6 gitlab-language=javascript
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment