mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-07-21 13:10:45 +02:00
fix merge conflict
This commit is contained in:
parent
7c7f05e6e2
commit
543cf723ef
|
@ -158,4 +158,4 @@ namespace MediaBrowser.Api.Devices
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
Loading…
Reference in a new issue