From 50e983e3a1784f35eb72c340613f639ba7eae9d7 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 24 Jan 2016 17:11:46 -0500
Subject: fix merge error

---
 MediaBrowser.Server.Implementations/Library/LibraryManager.cs | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'MediaBrowser.Server.Implementations/Library/LibraryManager.cs')

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;
 
-- 
cgit v1.2.3