From: Jef van Schendel <jefvanschendel@gmail.com>
Date: Mon, 25 Jul 2011 20:37:02 +0000 (+0200)
Subject: Fix merge conflict in user.html
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=00458460d9fbdcae85bef063c614ff94338ab305;p=mediagoblin.git

Fix merge conflict in user.html
---

00458460d9fbdcae85bef063c614ff94338ab305
diff --cc mediagoblin/templates/mediagoblin/user_pages/user.html
index b445d844,a2b85aff..7ab2031e
--- a/mediagoblin/templates/mediagoblin/user_pages/user.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/user.html
@@@ -41,10 -42,9 +41,10 @@@
        <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>
 +    <div class="clear"></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 %}