diff options
| -rw-r--r-- | templates/repo/issue/list.tmpl | 2 | ||||
| -rw-r--r-- | templates/user/dashboard/issues.tmpl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index 9cf6cdd972..ca6fa72b98 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -268,7 +268,7 @@ </a> {{end}} {{if .IsPull}} - {{if (len .PullRequest.ConflictedFiles) gt 0}} + {{if and (not .PullRequest.HasMerged) ((len .PullRequest.ConflictedFiles) gt 0)}} <span class="conflicting"><i class="octicon octicon-mirror"></i> {{$.i18n.Tr (TrN $.i18n.Lang (len .PullRequest.ConflictedFiles) "repo.pulls.num_conflicting_files_1" "repo.pulls.num_conflicting_files_n") (len .PullRequest.ConflictedFiles)}}</span> {{end}} {{end}} diff --git a/templates/user/dashboard/issues.tmpl b/templates/user/dashboard/issues.tmpl index a5d7c1454e..c8cc8b09df 100644 --- a/templates/user/dashboard/issues.tmpl +++ b/templates/user/dashboard/issues.tmpl @@ -152,7 +152,7 @@ </span> {{end}} {{if .IsPull}} - {{if (len .PullRequest.ConflictedFiles) gt 0}} + {{if and (not .PullRequest.HasMerged) ((len .PullRequest.ConflictedFiles) gt 0)}} <span class="conflicting"><i class="octicon octicon-mirror"></i> {{$.i18n.Tr (TrN $.i18n.Lang (len .PullRequest.ConflictedFiles) "repo.pulls.num_conflicting_files_1" "repo.pulls.num_conflicting_files_n") (len .PullRequest.ConflictedFiles)}}</span> {{end}} {{end}} |