From 66977cd32996b5bb6b4cc79a6ea92487e060569e Mon Sep 17 00:00:00 2001
From: Mark McDowall <markus.mcd5@gmail.com>
Date: Tue, 26 Mar 2013 01:05:37 -0700
Subject: [PATCH] Fixed merge conflict

---
 NzbDrone.Core/Datastore/TableMapping.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/NzbDrone.Core/Datastore/TableMapping.cs b/NzbDrone.Core/Datastore/TableMapping.cs
index 1781fc49c..26c960622 100644
--- 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>()