mirror of
https://github.com/Radarr/Radarr.git
synced 2024-09-11 12:02:35 +02:00
Fixed merge conflict
This commit is contained in:
parent
b6ac7638a1
commit
66977cd329
@ -40,7 +40,6 @@ public static void Map()
|
||||
|
||||
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>()
|
||||
|
Loading…
Reference in New Issue
Block a user