diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-01-24 17:11:46 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-01-24 17:11:46 -0500 |
| commit | 80a6360f77595043e0c1db11018ebde6bc512139 (patch) | |
| tree | 10458281fc2a0ab11ee82775ce4b15079a04612d /MediaBrowser.Server.Implementations/Library/LibraryManager.cs | |
| parent | 9b422977fe7d87a39e3dd6a4ce240a6199465c0a (diff) | |
fix merge error
Diffstat (limited to 'MediaBrowser.Server.Implementations/Library/LibraryManager.cs')
| -rw-r--r-- | MediaBrowser.Server.Implementations/Library/LibraryManager.cs | 2 |
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; |
