mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-07-03 04:13:38 +02:00
Add merge=union for CONTRIBUTORS.md
This commit is contained in:
parent
aac1007bdc
commit
b306758836
1
.gitattributes
vendored
Normal file
1
.gitattributes
vendored
Normal file
|
@ -0,0 +1 @@
|
||||||
|
CONTRIBUTORS.md merge=union
|
Loading…
Reference in a new issue