aboutsummaryrefslogtreecommitdiffstats
path: root/templates/admin
diff options
context:
space:
mode:
authorSergio Benitez <sbenitez@mit.edu>2015-09-09 13:44:51 -0700
committerSergio Benitez <sbenitez@mit.edu>2015-09-09 13:44:51 -0700
commit964d0262ff353db6a50ed5be83ebd22f71aa6e69 (patch)
tree8cbab6b6a9b4f62cbe9acb2a0b8752b531633362 /templates/admin
parent079a2d68db5c843ef2dbba65aeca46d5887d6b02 (diff)
parentb75d0378cbbf0523963fd9bc749543244be7392b (diff)
downloadgitea-964d0262ff353db6a50ed5be83ebd22f71aa6e69.tar.gz
gitea-964d0262ff353db6a50ed5be83ebd22f71aa6e69.zip
Merged conflicts.
Diffstat (limited to 'templates/admin')
-rw-r--r--templates/admin/dashboard.tmpl8
1 files changed, 1 insertions, 7 deletions
diff --git a/templates/admin/dashboard.tmpl b/templates/admin/dashboard.tmpl
index 5db717bfe1..874be79b01 100644
--- a/templates/admin/dashboard.tmpl
+++ b/templates/admin/dashboard.tmpl
@@ -25,12 +25,6 @@
<div class="panel-body admin-panel">
<div class="admin-table">
<table class="table">
- <thead>
- <tr>
- <th>{{.i18n.Tr "admin.dashboard.operation_name"}}</th>
- <th>{{.i18n.Tr "admin.dashboard.operation_switch"}}</th>
- </tr>
- </thead>
<tbody>
<tr>
<td>{{.i18n.Tr "admin.dashboard.clean_unbind_oauth"}}</td>
@@ -164,4 +158,4 @@
</div>
</div>
</div>
-{{template "ng/base/footer" .}} \ No newline at end of file
+{{template "ng/base/footer" .}}