Skip to content
Snippets Groups Projects
Commit 4377ba1c authored by Douwe Maan's avatar Douwe Maan
Browse files

Use gitattribute merge=union to reduce CHANGELOG merge conflicts.

parent 30cf916b
No related branches found
No related tags found
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment