open-source-mirrors
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #323 from joshuaboniface/gitattributes

Browse Source 
Add merge=union for CONTRIBUTORS.md
pull/1154/head
Joshua M. Boniface 6 years ago committed by GitHub
parent 9d91fa8ab8 b306758836
commit d10d632c48
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File

1
.gitattributes vendored
Unescape View File

@ -0,0 +1 @@
CONTRIBUTORS.md merge=union
Write Preview
Loading…
Cancel
Save