From 5e3b9e80ad4a9bc47682203991edc77ac20f324b Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sat, 2 Jan 2016 18:42:39 -0500
Subject: [PATCH] fix merge conflicts

---
 MediaBrowser.Providers/Manager/ItemImageProvider.cs | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/MediaBrowser.Providers/Manager/ItemImageProvider.cs b/MediaBrowser.Providers/Manager/ItemImageProvider.cs
index f99aa967fb..19f575d0d6 100644
--- a/MediaBrowser.Providers/Manager/ItemImageProvider.cs
+++ b/MediaBrowser.Providers/Manager/ItemImageProvider.cs
@@ -359,13 +359,12 @@ namespace MediaBrowser.Providers.Manager
         private void ClearImages(IHasImages item, ImageType type)
         {
             var deleted = false;
-            var deletedImages = new List<ItemImageInfo>();
 
             foreach (var image in item.GetImages(type).ToList())
             {
                 if (!image.IsLocalFile)
                 {
-                    deletedImages.Add(image);
+                    // TODO: Need to get this image removed
                     continue;
                 }
 
@@ -385,11 +384,6 @@ namespace MediaBrowser.Providers.Manager
                 }
             }
 
-            foreach (var image in deletedImages)
-            {
-                item.RemoveImage(image);
-            }
-
             if (deleted)
             {
                 item.ValidateImages(new DirectoryService(_logger, _fileSystem));