summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorDusty Phillips <dusty@gerolde.archlinux.org>2009-08-12 17:33:23 -0400
committerDusty Phillips <dusty@gerolde.archlinux.org>2009-08-12 17:33:23 -0400
commit6bcf9709f20db8b8e3e40c16b20448f3899f3624 (patch)
treeffc8ef24c6e6d21f0e79c4c3e172ddb490939f76 /templates
parenta085da1c22f7cc8ea245ec2fc018cd5eaadc3032 (diff)
merge fix
Diffstat (limited to 'templates')
-rw-r--r--templates/admin/index.html1
1 files changed, 0 insertions, 1 deletions
diff --git a/templates/admin/index.html b/templates/admin/index.html
index af4d0b78..6f7f98ee 100644
--- a/templates/admin/index.html
+++ b/templates/admin/index.html
@@ -10,7 +10,6 @@
{% block breadcrumbs %}{% endblock %}
{% block content %}
-pppppppp
<div id="content-main">
<div class="module">
<table>