Fixed merge conflict

11 years ago · 66977cd329
parent b6ac7638a1
commit 66977cd329
1 changed files with 0 additions and 1 deletions
--- a/NzbDrone.Core/Datastore/TableMapping.cs
+++ b/NzbDrone.Core/Datastore/TableMapping.cs
@ -40,7 +40,6 @@ namespace NzbDrone.Core.Datastore

            Mapper.Entity<History.History>().RegisterModel("History")
                .HasOne<History.History, Episode>(h => h.Episode, h => h.EpisodeId);
-                .LazyLoad((db, history) => db.Query<Episode>().Where(ep => ep.Id == history.EpisodeId).ToList());

            Mapper.Entity<Series>().RegisterModel("Series")
                  .Relationships.AutoMapComplexTypeProperties<ILazyLoaded>()