Remove invalid merge

ChristopherHX · ChristopherHX · commit 9d884e89fbf3 · 2023-03-15T10:48:03.000Z
diff --git a/modules/actions/workflows.go b/modules/actions/workflows.go
@@ -233,7 +233,6 @@ func matchPushEvent(commit *git.Commit, pushPayload *api.PushPayload, evt *jobpa
 					matchTimes++
 				}
 			}
-		}
 		default:
 			log.Warn("push event unsupported condition %q", cond)
 		}
@@ -365,4 +364,4 @@ func matchIssueCommentEvent(commit *git.Commit, issueCommentPayload *api.IssueCo
 		}
 	}
 	return matchTimes == len(evt.Acts)
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -233,7 +233,6 @@ func matchPushEvent(commit git.Commit, pushPayload api.PushPayload, evt *jobpa`
`233`	`233`	`matchTimes++`
`234`	`234`	`}`
`235`	`235`	`}`
`236`		`- }`
`237`	`236`	`default:`
`238`	`237`	`log.Warn("push event unsupported condition %q", cond)`
`239`	`238`	`}`
`@@ -365,4 +364,4 @@ func matchIssueCommentEvent(commit git.Commit, issueCommentPayload api.IssueCo`
`365`	`364`	`}`
`366`	`365`	`}`
`367`	`366`	`return matchTimes == len(evt.Acts)`
`368`		`-}`
	`367`	`+}`