From 6bcf9709f20db8b8e3e40c16b20448f3899f3624 Mon Sep 17 00:00:00 2001
From: Dusty Phillips <dusty@gerolde.archlinux.org>
Date: Wed, 12 Aug 2009 17:33:23 -0400
Subject: merge fix

---
 templates/admin/index.html | 1 -
 1 file changed, 1 deletion(-)

(limited to 'templates/admin')

diff --git a/templates/admin/index.html b/templates/admin/index.html
index af4d0b7..6f7f98e 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>
-- 
cgit v1.2.3-24-g4f1b