From ad74472b597d6a477f6c2e747478417a52327b4b Mon Sep 17 00:00:00 2001
From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Mon, 25 Jul 2011 15:30:56 -0500
Subject: [PATCH] Now actually apply Velmont's patch instead of just committing
 it ;)

---
 .../templates/mediagoblin/user_pages/user.html  |  6 +++---
 user_profile-fix_wrong_nesting.patch            | 17 -----------------
 2 files changed, 3 insertions(+), 20 deletions(-)
 delete mode 100644 user_profile-fix_wrong_nesting.patch

diff --git a/mediagoblin/templates/mediagoblin/user_pages/user.html b/mediagoblin/templates/mediagoblin/user_pages/user.html
index 9d99ac53..a2b85aff 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/user.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/user.html
@@ -42,9 +42,9 @@
       <a href={{ request.urlgen(
                      'mediagoblin.user_pages.atom_feed',
                      user=user.username) }}>atom feed</a>
-      {% else %}
-      {# This *should* not occur as the view makes sure we pass in a user. #}
-      <p>Sorry, no such user found.<p/>
     </div>
+  {% else %}
+    {# This *should* not occur as the view makes sure we pass in a user. #}
+    <p>Sorry, no such user found.<p/>
   {% endif %}
 {% endblock %}
diff --git a/user_profile-fix_wrong_nesting.patch b/user_profile-fix_wrong_nesting.patch
deleted file mode 100644
index 590f87ff..00000000
--- a/user_profile-fix_wrong_nesting.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/mediagoblin/templates/mediagoblin/user_pages/user.html b/mediagoblin/templates/mediagoblin/user_pages/user.html
-index 9d99ac5..a2b85af 100644
---- a/mediagoblin/templates/mediagoblin/user_pages/user.html
-+++ b/mediagoblin/templates/mediagoblin/user_pages/user.html
-@@ -42,9 +42,9 @@
-       <a href={{ request.urlgen(
-                      'mediagoblin.user_pages.atom_feed',
-                      user=user.username) }}>atom feed</a>
--      {% else %}
--      {# This *should* not occur as the view makes sure we pass in a user. #}
--      <p>Sorry, no such user found.<p/>
-     </div>
-+  {% else %}
-+    {# This *should* not occur as the view makes sure we pass in a user. #}
-+    <p>Sorry, no such user found.<p/>
-   {% endif %}
- {% endblock %}
-- 
2.25.1