Skip to content

Commit eaa901f

Browse files
ixxeL2097ixxeL2097
authored
feat(git): use gitattributes to automatically resolve conflicts for c… (#34)
2 parents 0d95239 + bac6e3d commit eaa901f

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.md merge=theirs

0 commit comments

Comments
 (0)