mirror of
https://github.com/jellyfin/jellyfin.git
synced 2025-07-09 03:04:24 -04:00
mix merge conflicts
This commit is contained in:
parent
6de54e5ec7
commit
170f463664
@ -73,7 +73,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
|
|||||||
private void UpdateList(List<T> newList)
|
private void UpdateList(List<T> newList)
|
||||||
{
|
{
|
||||||
var file = _dataPath + ".json";
|
var file = _dataPath + ".json";
|
||||||
_fileSystem.CreateDirectory(Path.GetDirectoryName(file));
|
_fileSystem.CreateDirectory(Path.GetDirectoryName(file));
|
||||||
|
|
||||||
lock (_fileDataLock)
|
lock (_fileDataLock)
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user