mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
Merge pull request #19 from JustAMan/git-attrs
Set union merge for CONTRIBUTORS.md
This commit is contained in:
commit
6a15a98e28
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…
Add table
Add a link
Reference in a new issue