LBRYCommunity/lbry-sdk
1
0
Fork 1
Code Issues Pull requests Projects Releases 282 Packages Wiki Activity

use union merge on CHANGELOG.md

Browse source 
http://krlmlr.github.io/using-gitattributes-to-avoid-merge-conflicts/
This commit is contained in:
jobevers 2017-02-20 21:37:50 -06:00
parent 07841a7803
commit 847a79f526
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitattributes vendored Normal file
View file

@ -0,0 +1 @@
/CHANGELOG.md merge=union