zeripath
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
0 additions and
1 deletions
-
services/pull/patch.go
|
|
@ -171,7 +171,6 @@ func TestPatch(pr *models.PullRequest) error { |
|
|
|
scanner := bufio.NewScanner(stderrReader) |
|
|
|
for scanner.Scan() { |
|
|
|
line := scanner.Text() |
|
|
|
fmt.Printf("%s\n", line) |
|
|
|
if strings.HasPrefix(line, prefix) { |
|
|
|
conflict = true |
|
|
|
filepath := strings.TrimSpace(strings.Split(line[len(prefix):], ":")[0]) |
|
|
|