[fenix] Adds a gitattribute file to manage changelog merges

5 years ago · d45d3e0b98
parent 3d4bb4b1c8
commit d45d3e0b98
1 changed files with 1 additions and 0 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -0,0 +1 @@
+CHANGELOG.md merge=union