summaryrefslogtreecommitdiffstats
path: root/templates/user/dashboard/issues.tmpl
diff options
context:
space:
mode:
Diffstat (limited to 'templates/user/dashboard/issues.tmpl')
-rw-r--r--templates/user/dashboard/issues.tmpl4
1 files changed, 2 insertions, 2 deletions
diff --git a/templates/user/dashboard/issues.tmpl b/templates/user/dashboard/issues.tmpl
index ed830998ac..c3e8f23761 100644
--- a/templates/user/dashboard/issues.tmpl
+++ b/templates/user/dashboard/issues.tmpl
@@ -179,7 +179,7 @@
{{end}}
{{if gt $rejectOfficial 0}}
- <span class="rejects">{{svg "octicon-request-changes" 16}}
+ <span class="rejects">{{svg "octicon-diff" 16}}
{{$.i18n.Tr (TrN $.i18n.Lang $rejectOfficial "repo.pulls.reject_count_1" "repo.pulls.reject_count_n") $rejectOfficial}}
</span>
{{end}}
@@ -191,7 +191,7 @@
{{end}}
{{if and (not .PullRequest.HasMerged) (gt (len .PullRequest.ConflictedFiles) 0)}}
- <span class="conflicting">{{svg "octicon-mirror" 16}} {{$.i18n.Tr (TrN $.i18n.Lang (len .PullRequest.ConflictedFiles) "repo.pulls.num_conflicting_files_1" "repo.pulls.num_conflicting_files_n") (len .PullRequest.ConflictedFiles)}}</span>
+ <span class="conflicting">{{svg "octicon-x" 16}} {{$.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}}
</p>