github-mirrors/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-04-23 21:47:14 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #323 from joshuaboniface/gitattributes

Browse source 
Add merge=union for CONTRIBUTORS.md
This commit is contained in:
Joshua M. Boniface 2018-12-30 00:46:29 -05:00 • committed by GitHub
commit d10d632c48
1 changed files with 1 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitattributes vendored Normal file
View file

@ -0,0 +1 @@
CONTRIBUTORS.md merge=union