aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2016-01-24 17:11:46 -0500
committerLuke Pulverenti <luke.pulverenti@gmail.com>2016-01-24 23:27:49 -0500
commit50e983e3a1784f35eb72c340613f639ba7eae9d7 (patch)
tree9e19faec0ea24a3bc751b912ec2a9b440f08e30c
parentd317bedd851b04bc427a6c7c396a09c48ea7a069 (diff)
fix merge error
-rw-r--r--MediaBrowser.Server.Implementations/Library/LibraryManager.cs2
1 files changed, 2 insertions, 0 deletions
diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
index d0e72ac63..0cb5174c9 100644
--- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
@@ -32,10 +32,12 @@ using System.Collections.Generic;
using System.Globalization;
using System.IO;
using System.Linq;
+using System.Net;
using System.Threading;
using System.Threading.Tasks;
using CommonIO;
using MediaBrowser.Model.Extensions;
+using MediaBrowser.Model.Net;
using MoreLinq;
using SortOrder = MediaBrowser.Model.Entities.SortOrder;