mix merge conflicts

This commit is contained in:
Luke Pulverenti 2015-11-20 23:55:26 -05:00
parent 6de54e5ec7
commit 170f463664
2 changed files with 3 additions and 3 deletions

View file

@ -73,7 +73,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
private void UpdateList(List<T> newList)
{
var file = _dataPath + ".json";
_fileSystem.CreateDirectory(Path.GetDirectoryName(file));
_fileSystem.CreateDirectory(Path.GetDirectoryName(file));
lock (_fileDataLock)
{