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

---
 devel/views.py             | 6 +++---
 templates/admin/index.html | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/devel/views.py b/devel/views.py
index 4c34d9f5..f9aacec2 100644
--- a/devel/views.py
+++ b/devel/views.py
@@ -8,8 +8,8 @@ from archweb_dev.main.models import Package, Todolist
 from archweb_dev.main.models import Arch, Repo
 from archweb_dev.main.models import UserProfile, News
 import random
-from string import letters, digits
-pwletters = letters + digits
+from string import ascii_letters, digits
+pwletters = ascii_letters + digits
 
 
 def index(request):
@@ -94,7 +94,7 @@ class NewUserForm(forms.ModelForm):
         profile.save()
 
         send_mail("Your new archweb account",
-               """You can now log into:
+                """You can now log into:
 https://dev.archlinux.org/
 with these login details:
 Username: %s
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>
-- 
cgit v1.2.3