Permalink
Browse files

oh crap I fail at git.

  • Loading branch information...
1 parent 672a285 commit fe502e9279cab25d888c0f3a64f3765e01d45ba4 @comex committed Jul 6, 2010
Showing with 0 additions and 8 deletions.
  1. +0 −3 Player2/Classes/PluginFlashView.m
  2. +0 −5 Player2/server.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
View
@@ -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);

0 comments on commit fe502e9

Please sign in to comment.