Fix merge conflict in user.html

diff --cc mediagoblin/templates/mediagoblin/user_pages/user.html
index b445d8441e5d1560bf081d636d62f9f7eb2722d5,a2b85aff5651dd4681df473ed36c375dc6bdd218..7ab2031e88edf19ce11f8a7936402a34334fa7a1
--- 1/mediagoblin/templates/mediagoblin/user_pages/user.html
--- 2/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 %}