Skip to content

Commit

Permalink
Configure merge=union for changelog.txt to reduce merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@TymurGubayev
TymurGubayev authored May 9, 2022
1 parent 64626c8 commit 9a893d6
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions .gitattributes
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
changelog.txt merge=union

0 comments on commit 9a893d6

Please sign in to comment.