mirror of
https://github.com/jellyfin/jellyfin.git
synced 2026-01-15 15:48:03 +00:00
Add merge=union for CONTRIBUTORS.md
This commit is contained in:
1
.gitattributes
vendored
Normal file
1
.gitattributes
vendored
Normal file
@@ -0,0 +1 @@
|
||||
CONTRIBUTORS.md merge=union
|
||||
Reference in New Issue
Block a user