Fix merge conflict in user.html

mediagoblin/templates/mediagoblin/user_pages/user.html

@@ -41,10 +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 %}