diff options
| author | Sven Van den brande <sven.vandenbrande@outlook.com> | 2014-11-12 19:21:14 +0100 |
|---|---|---|
| committer | Sven Van den brande <sven.vandenbrande@outlook.com> | 2014-11-12 19:21:14 +0100 |
| commit | b3c0ab869409a743c736a4e9f0cb91260187c7c6 (patch) | |
| tree | 8b90ef0f259ffcb0f4c3b27bb9014e1d89a6ee9a /MediaBrowser.Server.Implementations/Library/UserManager.cs | |
| parent | cbd2c2fc5435aead30513150fc9f50c86eebde49 (diff) | |
| parent | 4f5c7687042148507d5cedfcec81ab355f478f19 (diff) | |
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
Conflicts:
MediaBrowser.WebDashboard/dashboard-ui/livetvnewrecording.html
MediaBrowser.WebDashboard/dashboard-ui/livetvseriestimer.html
MediaBrowser.WebDashboard/dashboard-ui/livetvtimer.html
Diffstat (limited to 'MediaBrowser.Server.Implementations/Library/UserManager.cs')
| -rw-r--r-- | MediaBrowser.Server.Implementations/Library/UserManager.cs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/MediaBrowser.Server.Implementations/Library/UserManager.cs b/MediaBrowser.Server.Implementations/Library/UserManager.cs index 9e3fd3f17..fa34a2c1f 100644 --- a/MediaBrowser.Server.Implementations/Library/UserManager.cs +++ b/MediaBrowser.Server.Implementations/Library/UserManager.cs @@ -1,5 +1,4 @@ -using MediaBrowser.Common; -using MediaBrowser.Common.Events; +using MediaBrowser.Common.Events; using MediaBrowser.Common.Extensions; using MediaBrowser.Common.Net; using MediaBrowser.Controller; |