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

1 line
25 B
Text
Raw Normal View History

use union merge on CHANGELOG.md http://krlmlr.github.io/using-gitattributes-to-avoid-merge-conflicts/
2017-02-20 21:37:50 -06:00
/CHANGELOG.md merge=union
Reference in a new issue Copy permalink