Skip to content

Commit 9a893d6

Browse files
TymurGubayevTymurGubayev
authored
Configure merge=union for changelog.txt to reduce merge conflicts
1 parent 64626c8 commit 9a893d6

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

‎.gitattributes‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
changelog.txt merge=union

0 commit comments

Comments
 (0)