Removed log

Cocoanetics · Oct 26, 2012 · d0882e0 · d0882e0
1 parent dab3b44
commit d0882e0
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/Core/Source/DTDownloadCache.m b/Core/Source/DTDownloadCache.m
@@ -332,12 +332,6 @@ - (void)download:(DTDownload *)download didFailWithError:(NSError *)error
 
 - (void)download:(DTDownload *)download didFinishWithFile:(NSString *)path
 {
-<<<<<<< HEAD
-	//NSLog(@"did finish %@", download.URL);
-=======
-	NSLog(@"did finish %@", download.URL);
->>>>>>> cf6e01720bddec66632e898647db0fabf198ea15
-
     [_workerContext performBlock:^{
 		// check if URL already exists
 		DTCachedFile *cachedFile = [self _cachedFileForURL:download.URL inContext:_workerContext];