starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-16 05:53:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

Extra formatting on the merged code.

Browse Source
This commit is contained in:
Erwin de Haan
2019-01-15 17:35:33 +01:00
parent 49b61f238e
commit a358631040
4 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Emby.Server.Implementations/ApplicationHost.cs
View File

@@ -54,11 +54,6 @@ using MediaBrowser.Common.Events;
using MediaBrowser.Common.Extensions;
using MediaBrowser.Common.Net;
using MediaBrowser.Common.Plugins;
<<<<<<< HEAD
using MediaBrowser.Common.Security;
=======
using MediaBrowser.Model.Extensions;
>>>>>>> dev
using MediaBrowser.Common.Updates;
using MediaBrowser.Controller;
using MediaBrowser.Controller.Authentication;