oh crap I fail at git.

comex · Jul 6, 2010 · fe502e9 · fe502e9
1 parent 672a285
commit fe502e9
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 8 deletions.
diff --git a/Player2/Classes/PluginFlashView.m b/Player2/Classes/PluginFlashView.m
@@ -266,7 +266,6 @@ - (void)goToURL:(NSURL *)URL inFrame:(NSString *)frameName {
 	[frame loadRequest:[NSURLRequest requestWithURL:URL]];
 }
 
-<<<<<<< HEAD
 - (UIImage *)scaleImage:(UIImage *) image maxWidth:(float) maxWidth maxHeight:(float) maxHeight
 {
 	CGImageRef imgRef = image.CGImage;
@@ -312,7 +311,5 @@ - (UIImage *)scaleImage:(UIImage *) image maxWidth:(float) maxWidth maxHeight:(f
 
 }
 
-=======
->>>>>>> 7933cb7... - Fix a few more sandbox issues
 @synthesize server;
 @end
diff --git a/Player2/server.m b/Player2/server.m
@@ -259,12 +259,7 @@ int new_post_connection(int rpc_fd, stream_t stream, void *url, size_t url_len,
 int new_get_connection(int rpc_fd, stream_t stream, void *url, size_t url_len, void *target, size_t target_len, void **url_abs, size_t *url_abs_len) {
 	Server *self = get_server(rpc_fd);
 	NSString *str = [[[NSString alloc] initWithBytes:url length:url_len encoding:NSUTF8StringEncoding] autorelease];
-<<<<<<< HEAD
 	NSURL *nsurl = [NSURL URLWithString:str relativeToURL:[self->delegate baseURL]];
-=======
-	NSURL *nsurl = [NSURL URLWithString:str
-						  relativeToURL:[self->delegate baseURL]];
->>>>>>> 7933cb7... - Fix a few more sandbox issues
 	if(target_len > 0) {
 		// This is wrong.
 		NSLog(@"new_connection with target %s", target);