Commit 70a9fb51 authored by Lukas Riedel's avatar Lukas Riedel

Add .gitattributes file with merge strategy for CHANGELOG.md

parent 1c710199
CHANGELOG.md merge=union
\ No newline at end of file
Markdown is supported
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