fix merge conflict

9 years ago · 797b4f822a
parent a387942107
commit 797b4f822a
1 changed files with 2 additions and 2 deletions
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@ -1779,8 +1779,8 @@ namespace MediaBrowser.Controller.Entities
                ProviderIds = ProviderIds,
                IndexNumber = IndexNumber,
                ParentIndexNumber = ParentIndexNumber,
-				Year = ProductionYear,
-				PremiereDate = PremiereDate
+                Year = ProductionYear,
+                PremiereDate = PremiereDate
            };
        }