Commit 2d859aa

committed

创建了 "合并请求" 写成了 "请求合并"

1 parent fba8778 commit 2d859aaCopy full SHA for 2d859aa

File tree

-1

lines changed

-1

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ + (NSAttributedString )attrContentWithObj:(ProjectLineNote)curActivity{`
`103`	`103`	`userName = curActivity.author.name? curActivity.author.name: @"";`
`104`	`104`	`NSMutableAttributedString *attrContent;`
`105`	`105`	`if ([curActivity.action isEqualToString:@"create"]) {`
`106`		`- contentStr = [NSString stringWithFormat:@"创建了请求合并 - %@", [curActivity.created_at stringDisplay_HHmm]];`
	`106`	`+ contentStr = [NSString stringWithFormat:@"创建了合并请求 - %@", [curActivity.created_at stringDisplay_HHmm]];`
`107`	`107`	`} else if ([curActivity.action isEqualToString:@"merge"]) {`
`108`	`108`	`contentStr = [NSString stringWithFormat:@"合并了合并请求 - %@", [curActivity.created_at stringDisplay_HHmm]];`
`109`	`109`	`} else if ([curActivity.action isEqualToString:@"review_undo"]) {`

Comments

(0)