From 170154df18fda463de5107b7767f226fe79da79d Mon Sep 17 00:00:00 2001
From: LukePulverenti <luke.pulverenti@gmail.com>
Date: Tue, 26 Feb 2013 15:07:06 -0500
Subject: assembly consolidation

---
 MediaBrowser.ServerApplication/ApplicationHost.cs                    | 2 +-
 MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

(limited to 'MediaBrowser.ServerApplication')

diff --git a/MediaBrowser.ServerApplication/ApplicationHost.cs b/MediaBrowser.ServerApplication/ApplicationHost.cs
index 2cdb5789b..2fe257aaf 100644
--- a/MediaBrowser.ServerApplication/ApplicationHost.cs
+++ b/MediaBrowser.ServerApplication/ApplicationHost.cs
@@ -1,6 +1,7 @@
 using BDInfo;
 using MediaBrowser.ClickOnce;
 using MediaBrowser.Common.Implementations;
+using MediaBrowser.Common.Implementations.Logging;
 using MediaBrowser.Common.Implementations.ScheduledTasks;
 using MediaBrowser.Common.Implementations.Serialization;
 using MediaBrowser.Common.IO;
@@ -10,7 +11,6 @@ using MediaBrowser.Common.Net;
 using MediaBrowser.Common.ScheduledTasks;
 using MediaBrowser.Controller;
 using MediaBrowser.IsoMounter;
-using MediaBrowser.Logging.Nlog;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.MediaInfo;
diff --git a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
index 3c82943bd..9492fcfe0 100644
--- a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
+++ b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
@@ -278,10 +278,6 @@
       <Project>{5356ae30-6a6e-4a64-81e3-f76c50595e64}</Project>
       <Name>MediaBrowser.IsoMounter</Name>
     </ProjectReference>
-    <ProjectReference Include="..\MediaBrowser.Logging.NLog\MediaBrowser.Logging.NLog.csproj">
-      <Project>{67310740-0ec4-4dc2-9921-33df38b20167}</Project>
-      <Name>MediaBrowser.Logging.NLog</Name>
-    </ProjectReference>
     <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj">
       <Project>{7eeeb4bb-f3e8-48fc-b4c5-70f0fff8329b}</Project>
       <Name>MediaBrowser.Model</Name>
-- 
cgit v1.2.3