Merge pull request #8 from jellyfin/master

rebase to latest master

1 files changed, 5 insertions, 5 deletions

diff --git a/MediaBrowser.Api/UserService.cs b/MediaBrowser.Api/UserService.cs
index 913a55b2b..2ef18d7cf 100644
--- a/MediaBrowser.Api/UserService.cs
+++ b/MediaBrowser.Api/UserService.cs
@@ -1,6 +1,9 @@
-using MediaBrowser.Controller.Authentication;
+using System;
+using System.Linq;
+using System.Threading.Tasks;
 using MediaBrowser.Common.Extensions;
 using MediaBrowser.Common.Net;
+using MediaBrowser.Controller.Authentication;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Devices;
 using MediaBrowser.Controller.Library;
@@ -9,11 +12,8 @@ using MediaBrowser.Controller.Session;
 using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.Connect;
 using MediaBrowser.Model.Dto;
-using MediaBrowser.Model.Users;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
 using MediaBrowser.Model.Services;
+using MediaBrowser.Model.Users;
 
 namespace MediaBrowser.Api
 {