You've already forked Sonarr
mirror of
https://github.com/Sonarr/Sonarr.git
synced 2025-09-16 09:26:36 +02:00
Fixed merge conflict
This commit is contained in:
@@ -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>()
|
||||||
|
Reference in New Issue
Block a user