From e76db38c9367cc7dc33febf9d2c7f488ca31bf93 Mon Sep 17 00:00:00 2001
From: James South <james_south@hotmail.com>
Date: Sun, 22 Dec 2013 11:49:10 +0000
Subject: [PATCH] Fixing bad merge

Former-commit-id: a4c4d84856e989f4400012db0ac759b70cdb3b3e
---
 src/ImageProcessor.Web/NET45/Caching/MemCache.cs   | 14 +-------------
 .../NET45/Properties/AssemblyInfo.cs               |  7 +------
 2 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/src/ImageProcessor.Web/NET45/Caching/MemCache.cs b/src/ImageProcessor.Web/NET45/Caching/MemCache.cs
index 900192b22..a20971b98 100644
--- a/src/ImageProcessor.Web/NET45/Caching/MemCache.cs
+++ b/src/ImageProcessor.Web/NET45/Caching/MemCache.cs
@@ -131,7 +131,7 @@ namespace ImageProcessor.Web.Caching
         /// True if the update try succeeds, or false if there is an already an entry
         ///  in the cache with the same key as key.
         /// </returns>
-        public static bool UpdateItem(string key, object value, CacheItemPolicy policy = null, string regionName = null)
+        public static bool UpdateItem(string key, object value, CacheItemPolicy policy = null, string regionName = null) 
         {
             bool isUpDated = true;
 
@@ -181,12 +181,8 @@ namespace ImageProcessor.Web.Caching
 
                 if (isRemoved)
                 {
-<<<<<<< HEAD
-                    CacheItems.Keys.Remove(key);
-=======
                     string removedValue;
                     CacheItems.TryRemove(key, out removedValue);
->>>>>>> origin/dev
                 }
             }
 
@@ -233,12 +229,8 @@ namespace ImageProcessor.Web.Caching
                     // Loop through and clear out the dictionary of cache keys.
                     foreach (KeyValuePair<string, string> cacheItem in tempDictionary)
                     {
-<<<<<<< HEAD
-                        CacheItems.Keys.Remove(cacheItem.Key);
-=======
                         string removedValue;
                         CacheItems.TryRemove(cacheItem.Key, out removedValue);
->>>>>>> origin/dev
                     }
                 }
             }
@@ -247,8 +239,4 @@ namespace ImageProcessor.Web.Caching
         }
         #endregion
     }
-<<<<<<< HEAD
 }
-=======
-}
->>>>>>> origin/dev
diff --git a/src/ImageProcessor.Web/NET45/Properties/AssemblyInfo.cs b/src/ImageProcessor.Web/NET45/Properties/AssemblyInfo.cs
index f053f9230..89b552680 100644
--- a/src/ImageProcessor.Web/NET45/Properties/AssemblyInfo.cs
+++ b/src/ImageProcessor.Web/NET45/Properties/AssemblyInfo.cs
@@ -25,17 +25,12 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version  
 //      Build Number
 //      Revision
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-<<<<<<< HEAD
-[assembly: AssemblyVersion("3.0.0.0")]
-[assembly: AssemblyFileVersion("3.0.0.0")]
-=======
 [assembly: AssemblyVersion("3.0.0.1")]
 [assembly: AssemblyFileVersion("3.0.0.1")]
 
->>>>>>> origin/dev