From d0af0610d5fda09acff4dc66206b6fa7fbaf00a4 Mon Sep 17 00:00:00 2001
From: LukePulverenti <luke.pulverenti@gmail.com>
Date: Wed, 27 Feb 2013 12:07:12 -0500
Subject: fix merge issue

---
 .../BaseApplicationHost.cs                             | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

(limited to 'MediaBrowser.Common.Implementations/BaseApplicationHost.cs')

diff --git a/MediaBrowser.Common.Implementations/BaseApplicationHost.cs b/MediaBrowser.Common.Implementations/BaseApplicationHost.cs
index 811f3e92a..68e94fe26 100644
--- a/MediaBrowser.Common.Implementations/BaseApplicationHost.cs
+++ b/MediaBrowser.Common.Implementations/BaseApplicationHost.cs
@@ -1,19 +1,11 @@
-<<<<<<< HEAD
-using MediaBrowser.Common.IO;
-using MediaBrowser.Common.Implementations.HttpServer;
-using MediaBrowser.Common.Implementations.Udp;
+using MediaBrowser.Common.Implementations.Udp;
+using MediaBrowser.Common.Implementations.Updates;
 using MediaBrowser.Common.Implementations.WebSocket;
 using MediaBrowser.Common.Kernel;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Common.ScheduledTasks;
-using MediaBrowser.Model.IO;
-=======
-using MediaBrowser.Common.Implementations.Updates;
-using MediaBrowser.Common.Kernel;
 using MediaBrowser.Common.Updates;
->>>>>>> c9f48fe0d0d5cf4aec62df1d1e97f629967aff6f
 using MediaBrowser.Model.Logging;
-using MediaBrowser.Model.MediaInfo;
 using MediaBrowser.Model.Serialization;
 using SimpleInjector;
 using System;
@@ -50,11 +42,6 @@ namespace MediaBrowser.Common.Implementations
         /// </summary>
         protected readonly Container Container = new Container();
       
-        /// <summary>
-        /// The package manager
-        /// </summary>
-        protected readonly IPackageManager PackageManager = new PackageManager();
-      
         /// <summary>
         /// Gets assemblies that failed to load
         /// </summary>
@@ -187,6 +174,7 @@ namespace MediaBrowser.Common.Implementations
             RegisterSingleInstance<IWebSocketServer>(() => new AlchemyServer(Logger));
             RegisterSingleInstance(ProtobufSerializer);
             RegisterSingleInstance<IUdpServer>(new UdpServer(Logger), false);
+            RegisterSingleInstance<IPackageManager>(new PackageManager());
 
             RegisterSingleInstance(networkManager);
             RegisterSingleInstance(serverManager);
-- 
cgit v1.2.3