forked from LBRYCommunity/lbry-sdk
use union merge on CHANGELOG.md
http://krlmlr.github.io/using-gitattributes-to-avoid-merge-conflicts/
This commit is contained in:
parent
07841a7803
commit
847a79f526
1 changed files with 1 additions and 0 deletions
1
.gitattributes
vendored
Normal file
1
.gitattributes
vendored
Normal file
|
@ -0,0 +1 @@
|
|||
/CHANGELOG.md merge=union
|
Loading…
Reference in a new issue