mirror of
https://github.com/jellyfin/jellyfin.git
synced 2026-04-20 09:52:51 +02:00
Add merge=union for CONTRIBUTORS.md
This commit is contained in:
parent
aac1007bdc
commit
b306758836
1 changed files with 1 additions and 0 deletions
1
.gitattributes
vendored
Normal file
1
.gitattributes
vendored
Normal file
|
|
@ -0,0 +1 @@
|
|||
CONTRIBUTORS.md merge=union
|
||||
Loading…
Reference in a new issue