Merge branch 'dev' into code-cleanup

6 files changed, 7 insertions, 7 deletions

diff --git a/Emby.Naming/Video/CleanDateTimeParser.cs b/Emby.Naming/Video/CleanDateTimeParser.cs
index c8eb9abf88..ee6ec8ba07 100644
--- a/Emby.Naming/Video/CleanDateTimeParser.cs
+++ b/Emby.Naming/Video/CleanDateTimeParser.cs
@@ -38,7 +38,7 @@ namespace Emby.Naming.Video
             }
             catch (ArgumentException)
             {
-                
+
             }
 
             var result = _options.CleanDateTimeRegexes.Select(i => Clean(name, i))
diff --git a/Emby.Naming/Video/StackResolver.cs b/Emby.Naming/Video/StackResolver.cs
index 2a71255368..995e95d421 100644
--- a/Emby.Naming/Video/StackResolver.cs
+++ b/Emby.Naming/Video/StackResolver.cs
@@ -126,7 +126,7 @@ namespace Emby.Naming.Video
                                             }
                                             stack.Files.Add(file2.FullName);
                                         }
-                                        else 
+                                        else
                                         {
                                             // Sequel
                                             offset = 0;
diff --git a/Emby.Naming/Video/StubResolver.cs b/Emby.Naming/Video/StubResolver.cs
index 69f1f50fa0..33d6baefd3 100644
--- a/Emby.Naming/Video/StubResolver.cs
+++ b/Emby.Naming/Video/StubResolver.cs
@@ -18,7 +18,7 @@ namespace Emby.Naming.Video
         {
             var result = new StubResult();
             var extension = Path.GetExtension(path) ?? string.Empty;
-            
+
             if (_options.StubFileExtensions.Contains(extension, StringComparer.OrdinalIgnoreCase))
             {
                 result.IsStub = true;
diff --git a/Emby.Naming/Video/VideoFileInfo.cs b/Emby.Naming/Video/VideoFileInfo.cs
index 96839c31ef..3cdc483ff3 100644
--- a/Emby.Naming/Video/VideoFileInfo.cs
+++ b/Emby.Naming/Video/VideoFileInfo.cs
@@ -55,7 +55,7 @@ namespace Emby.Naming.Video
         /// Gets or sets the type of the stub.
         /// </summary>
         /// <value>The type of the stub.</value>
-        public string StubType { get; set; }        
+        public string StubType { get; set; }
         /// <summary>
         /// Gets or sets the type.
         /// </summary>
diff --git a/Emby.Naming/Video/VideoInfo.cs b/Emby.Naming/Video/VideoInfo.cs
index f4d311b975..033a8ae2d0 100644
--- a/Emby.Naming/Video/VideoInfo.cs
+++ b/Emby.Naming/Video/VideoInfo.cs
@@ -32,7 +32,7 @@ namespace Emby.Naming.Video
         /// </summary>
         /// <value>The alternate versions.</value>
         public List<VideoFileInfo> AlternateVersions { get; set; }
-        
+
         public VideoInfo()
         {
             Files = new List<VideoFileInfo>();
diff --git a/Emby.Naming/Video/VideoListResolver.cs b/Emby.Naming/Video/VideoListResolver.cs
index 23e012c301..aa4bb61279 100644
--- a/Emby.Naming/Video/VideoListResolver.cs
+++ b/Emby.Naming/Video/VideoListResolver.cs
@@ -55,9 +55,9 @@ namespace Emby.Naming.Video
 
                 info.Year = info.Files.First().Year;
 
-                var extraBaseNames = new List<string> 
+                var extraBaseNames = new List<string>
                 {
-                    stack.Name, 
+                    stack.Name,
                     Path.GetFileNameWithoutExtension(stack.Files[0])
                 };