aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller/Entities/Folder.cs
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2016-07-29 22:47:20 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2016-07-29 22:47:20 -0400
commit32abd342e19437021c01a43ec3df701ef1b213ea (patch)
tree1df4070e69ac80bb66b2c6d57942926d7914c245 /MediaBrowser.Controller/Entities/Folder.cs
parentd174f641836eea232885a45dec86ab0a9f3c9f4b (diff)
parentcb994c3e7abbc49e661b8704e4bdf31a68e6e694 (diff)
Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev
Diffstat (limited to 'MediaBrowser.Controller/Entities/Folder.cs')
-rw-r--r--MediaBrowser.Controller/Entities/Folder.cs6
1 files changed, 1 insertions, 5 deletions
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index 0397e9a88..6a7e279be 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -1,5 +1,4 @@
using MediaBrowser.Common.Progress;
-using MediaBrowser.Controller.Entities.TV;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Dto;
@@ -919,10 +918,7 @@ namespace MediaBrowser.Controller.Entities
catch
{
// Already logged at lower levels
- return new QueryResult<BaseItem>
- {
-
- };
+ return new QueryResult<BaseItem>();
}
}