Permalink
Browse files

fixed error in comment

  • Loading branch information...
1 parent 6a42e72 commit 4de0577a5c883497e7aa15dd8d8149bad8d7c9bd @bobbypage bobbypage committed Jul 16, 2011
Showing with 0 additions and 4 deletions.
  1. +0 −4 MKStoreManager.m
View
4 MKStoreManager.m
@@ -354,11 +354,7 @@ - (NSMutableArray*) purchasableObjectsDescription
NSDictionary *prices = [[MKStoreManager sharedManager] pricesDictionary];
-<<<<<<< HEAD
NSString *upgradePrice = [prices objectForKey:@"com.mycompany.upgrade"]
-=======
-NSString *upgradePrice = [dict objectForKey:@"com.mycompany.upgrade"]
->>>>>>> b8a45164a8b5a0e492bfdfe59e3515cc3b952cf4
*/
- (NSMutableDictionary *)pricesDictionary {

0 comments on commit 4de0577

Please sign in to comment.