Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

Conflicts:
	MediaBrowser.Common.Implementations/BaseApplicationHost.cs
	MediaBrowser.ServerApplication/ApplicationHost.cs

1 files changed, 11 insertions, 0 deletions

diff --git a/MediaBrowser.Common.Implementations/BaseApplicationHost.cs b/MediaBrowser.Common.Implementations/BaseApplicationHost.cs
index 65d170382..811f3e92a 100644
--- a/MediaBrowser.Common.Implementations/BaseApplicationHost.cs
+++ b/MediaBrowser.Common.Implementations/BaseApplicationHost.cs
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 using MediaBrowser.Common.IO;
 using MediaBrowser.Common.Implementations.HttpServer;
 using MediaBrowser.Common.Implementations.Udp;
@@ -6,6 +7,11 @@ 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;
@@ -45,6 +51,11 @@ namespace MediaBrowser.Common.Implementations
         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>
         public List<string> FailedAssemblies { get; protected set; }