Skip to content

Commit 8a0d0d8

Browse files
authored
Merge pull request #63 from dmaclach/patch-1
Fix up duplicate arg name in Objective C
2 parents 10ca276 + 313424f commit 8a0d0d8

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

objectivec/DiffMatchPatch.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ typedef enum {
156156
- (NSMutableArray *)diff_mainOfOldString:(NSString *)text1 andNewString:(NSString *)text2 checkLines:(BOOL)checklines deadline:(NSTimeInterval)deadline;
157157
- (NSMutableArray *)diff_computeFromOldString:(NSString *)text1 andNewString:(NSString *)text2 checkLines:(BOOL)checklines deadline:(NSTimeInterval)deadline;
158158
- (NSMutableArray *)diff_lineModeFromOldString:(NSString *)text1 andNewString:(NSString *)text2 deadline:(NSTimeInterval)deadline;
159-
- (NSArray *)diff_linesToCharsForFirstString:(NSString *)text1 andSecondString:(NSString *)text1;
159+
- (NSArray *)diff_linesToCharsForFirstString:(NSString *)text1 andSecondString:(NSString *)text2;
160160
- (void)diff_chars:(NSArray *)diffs toLines:(NSMutableArray *)lineArray;
161161
- (NSMutableArray *)diff_bisectOfOldString:(NSString *)text1 andNewString:(NSString *)text2 deadline:(NSTimeInterval)deadline;
162162
- (NSMutableArray *)diff_bisectSplitOfOldString:(NSString *)text1 andNewString:(NSString *)text2 x:(NSUInteger)x y:(NSUInteger)y deadline:(NSTimeInterval)deadline;

0 commit comments

Comments
 (0)