From bd169e4fd4f5586ab8dad323a520cbcc10de54fe Mon Sep 17 00:00:00 2001
From: hawken <hawken@thehawken.org>
Date: Mon, 7 Jan 2019 23:27:46 +0000
Subject: remove trailing whitespace

---
 MediaBrowser.Controller/Library/IUserManager.cs    | 4 ++--
 MediaBrowser.Controller/Library/ItemResolveArgs.cs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'MediaBrowser.Controller/Library')

diff --git a/MediaBrowser.Controller/Library/IUserManager.cs b/MediaBrowser.Controller/Library/IUserManager.cs
index d29b164ef..154ef3b05 100644
--- a/MediaBrowser.Controller/Library/IUserManager.cs
+++ b/MediaBrowser.Controller/Library/IUserManager.cs
@@ -123,7 +123,7 @@ namespace MediaBrowser.Controller.Library
         /// <param name="user">The user.</param>
         /// <returns>Task.</returns>
         void ResetEasyPassword(User user);
-        
+
         /// <summary>
         /// Changes the password.
         /// </summary>
@@ -133,7 +133,7 @@ namespace MediaBrowser.Controller.Library
         /// Changes the easy password.
         /// </summary>
         void ChangeEasyPassword(User user, string newPassword, string newPasswordSha1);
-        
+
         /// <summary>
         /// Gets the user dto.
         /// </summary>
diff --git a/MediaBrowser.Controller/Library/ItemResolveArgs.cs b/MediaBrowser.Controller/Library/ItemResolveArgs.cs
index 9812802e7..238dd2880 100644
--- a/MediaBrowser.Controller/Library/ItemResolveArgs.cs
+++ b/MediaBrowser.Controller/Library/ItemResolveArgs.cs
@@ -126,7 +126,7 @@ namespace MediaBrowser.Controller.Library
             {
                 var item = parent as T;
 
-                // Just in case the user decided to nest episodes. 
+                // Just in case the user decided to nest episodes.
                 // Not officially supported but in some cases we can handle it.
                 if (item == null)
                 {
-- 
cgit v1.2.3


From 7603b8d0fe73bd6d0ac3d90e3abb117ce3141832 Mon Sep 17 00:00:00 2001
From: Joshua Boniface <joshua@boniface.me>
Date: Wed, 9 Jan 2019 12:44:48 -0500
Subject: Update TheTVDB API key to our own

---
 MediaBrowser.Controller/Library/TVUtils.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'MediaBrowser.Controller/Library')

diff --git a/MediaBrowser.Controller/Library/TVUtils.cs b/MediaBrowser.Controller/Library/TVUtils.cs
index dc95ba112..162ebc75e 100644
--- a/MediaBrowser.Controller/Library/TVUtils.cs
+++ b/MediaBrowser.Controller/Library/TVUtils.cs
@@ -11,7 +11,7 @@ namespace MediaBrowser.Controller.Library
         /// <summary>
         /// The TVDB API key
         /// </summary>
-        public static readonly string TvdbApiKey = "B89CE93890E9419B";
+        public static readonly string TvdbApiKey = "OG4V3YJ3FAP7FP2K";
         public static readonly string TvdbBaseUrl = "https://www.thetvdb.com/";
         /// <summary>
         /// The banner URL
-- 
cgit v1.2.3