Fixed wrong merge of NSArray+reverse

Conflicts: NSArray+reverse.h NSArray+reverse.m
msghiorso · Dec 16, 2010 · df6f61c · df6f61c
1 parent ef5d776
commit df6f61c
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 20 deletions.
diff --git a/NSArray+reverse.h b/NSArray+reverse.h
@@ -3,19 +3,11 @@
 //  CMathParser
 //
 //  Created by Johannes Wolf on 27.09.10.
-<<<<<<< HEAD
 //  Copyright 2010 beanage. All rights reserved.
-=======
-//  Copyright 2010 __MyCompanyName__. All rights reserved.
->>>>>>> refs/remotes/old/master
 //
 
 #import <Cocoa/Cocoa.h>
 
-<<<<<<< HEAD
-
-=======
->>>>>>> refs/remotes/old/master
 @interface NSArray (reverse)
 
 - (NSArray *) reversedArray;
@@ -27,8 +19,4 @@
 
 - (void) reverse;
 
-<<<<<<< HEAD
-@end
-=======
 @end
->>>>>>> refs/remotes/old/master
diff --git a/NSArray+reverse.m b/NSArray+reverse.m
@@ -3,19 +3,11 @@
 //  CMathParser
 //
 //  Created by Johannes Wolf on 27.09.10.
-<<<<<<< HEAD
 //  Copyright 2010 beanage. All rights reserved.
 //
 
 #import "NSArray+reverse.h"
 
-
-=======
-//  Copyright 2010 __MyCompanyName__. All rights reserved.
-//
-
-#import "NSArray+reverse.h"
->>>>>>> refs/remotes/old/master
 @implementation NSArray (reverse)
 
 - (NSArray *) reversedArray;