Skip to content

Commit 67d9d11

Browse files
DirbaioDirbaio
committed
add merge=union to CHANGELOG.md to avoid merge conflicts.
1 parent 0cc439f commit 67d9d11

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

‎.gitattributes

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
CHANGELOG.md merge=union
2+

0 commit comments

Comments
 (0)