mirror of
https://github.com/jellyfin/jellyfin.git
synced 2025-07-09 03:04:24 -04:00
Merge pull request #323 from joshuaboniface/gitattributes
Add merge=union for CONTRIBUTORS.md
This commit is contained in:
commit
d10d632c48
1
.gitattributes
vendored
Normal file
1
.gitattributes
vendored
Normal file
@ -0,0 +1 @@
|
||||
CONTRIBUTORS.md merge=union
|
Loading…
x
Reference in New Issue
Block a user