1
0
Fork 0
mirror of https://github.com/Radarr/Radarr synced 2025-03-12 07:05:08 +00:00

Fixed merge conflict

This commit is contained in:
Mark McDowall 2013-03-26 01:05:37 -07:00
parent b6ac7638a1
commit 66977cd329

View file

@ -40,7 +40,6 @@ namespace NzbDrone.Core.Datastore
Mapper.Entity<History.History>().RegisterModel("History") Mapper.Entity<History.History>().RegisterModel("History")
.HasOne<History.History, Episode>(h => h.Episode, h => h.EpisodeId); .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") Mapper.Entity<Series>().RegisterModel("Series")
.Relationships.AutoMapComplexTypeProperties<ILazyLoaded>() .Relationships.AutoMapComplexTypeProperties<ILazyLoaded>()