mix merge conflicts

9 years ago · 170f463664
parent 6de54e5ec7
commit 170f463664
2 changed files with 3 additions and 3 deletions
--- a/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/ItemDataProvider.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/ItemDataProvider.cs
@ -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)
            {