From d85d5833af1961fb05053514a7356a827eae2a7d Mon Sep 17 00:00:00 2001
From: Olivier Poitrey <rs@dailymotion.com>
Date: Mon, 5 Nov 2012 20:04:58 +0100
Subject: [PATCH] Fix fucked-up merge

---
 SDWebImage/SDWebImageDownloader.m | 1 -
 1 file changed, 1 deletion(-)

diff --git a/SDWebImage/SDWebImageDownloader.m b/SDWebImage/SDWebImageDownloader.m
index 05019ee3..81661c46 100644
--- a/SDWebImage/SDWebImageDownloader.m
+++ b/SDWebImage/SDWebImageDownloader.m
@@ -107,7 +107,6 @@ NSString *const kCompletedCallbackKey = @"completed";
         {
             // In order to prevent from potential duplicate caching (NSURLCache + SDImageCache) we disable the cache for image requests
             NSMutableURLRequest *request = [NSMutableURLRequest.alloc initWithURL:url cachePolicy:NSURLCacheStorageNotAllowed timeoutInterval:15];
-            NSMutableURLRequest *request = [NSMutableURLRequest.alloc initWithURL:url cachePolicy:NSURLRequestReloadIgnoringLocalCacheData timeoutInterval:15];
             request.HTTPShouldHandleCookies = NO;
             request.HTTPShouldUsePipelining = YES;
             [request addValue:@"image/*" forHTTPHeaderField:@"Accept"];