alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-22 10:04:44 +01:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	MediaBrowser.Common.Implementations/BaseApplicationHost.cs
	MediaBrowser.ServerApplication/ApplicationHost.cs
This commit is contained in:
LukePulverenti
2013-02-27 11:57:14 -05:00
parent ca7ee68473 1d51ede060
commit 6d5d291762
10 changed files with 266 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
MediaBrowser.Common.Implementations/BaseApplicationHost.cs
View File

@@ -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;
@@ -44,6 +50,11 @@ 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>