Permalink
Browse files

got build to build

  • Loading branch information...
1 parent 9dc6663 commit 3229f208df0f70d8e7b21670b5e5205d41105eea @jchris jchris committed May 14, 2011
Showing with 4 additions and 6 deletions.
  1. +4 −6 OnTheSpot/RootViewController.m
@@ -287,8 +287,8 @@ - (void)storeImage:(UIImage*)anImage withMetaData:(NSDictionary*)metaData
break;
}
}
- NSString* dateFormat = @"yyyy-MM-dd'T'HH:mm:ssZZZ";
- NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
+// NSString* dateFormat = @"yyyy-MM-dd'T'HH:mm:ssZZZ";
+// NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
// [dateFormatter ]
NSMutableDictionary* jsonData = [NSMutableDictionary dictionaryWithObjectsAndKeys:
@@ -304,8 +304,6 @@ - (void)storeImage:(UIImage*)anImage withMetaData:(NSDictionary*)metaData
[dateFormatter release];
// store image in CouchDB
-<<<<<<< Updated upstream
-=======
// Test the various JSON transforms
NSError* error = NULL;
NSData* theJSON = [[CJSONSerializer serializer] serializeDictionary:jsonData error:&error];
@@ -315,7 +313,7 @@ - (void)storeImage:(UIImage*)anImage withMetaData:(NSDictionary*)metaData
else {
NSString *jsonString = [[NSString alloc] initWithData:theJSON encoding:NSUTF8StringEncoding];
NSLog(@"Saving JSON %@", jsonString);
- requestWithURL
+// requestWithURL
//
@@ -340,7 +338,7 @@ - (void)storeImage:(UIImage*)anImage withMetaData:(NSDictionary*)metaData
// [op start];
// }
}
->>>>>>> Stashed changes
+//>>>>>>> Stashed changes
}
- (void)startMotionSampling

0 comments on commit 3229f20

Please sign in to comment.