diff options
| author | Jef van Schendel <jefvanschendel@gmail.com> | 2011-07-25 22:37:02 +0200 |
|---|---|---|
| committer | Jef van Schendel <jefvanschendel@gmail.com> | 2011-07-25 22:37:02 +0200 |
| commit | 00458460d9fbdcae85bef063c614ff94338ab305 (patch) | |
| tree | 246cdcab3d355a5aa0777bb9603d47d8df4923db | |
| parent | b1f11df07cdef805f354f2c046e146783ad4256f (diff) | |
| parent | ad74472b597d6a477f6c2e747478417a52327b4b (diff) | |
| download | mediagoblin-00458460d9fbdcae85bef063c614ff94338ab305.tar.lz mediagoblin-00458460d9fbdcae85bef063c614ff94338ab305.tar.xz mediagoblin-00458460d9fbdcae85bef063c614ff94338ab305.zip | |
Fix merge conflict in user.html
| -rw-r--r-- | mediagoblin/templates/mediagoblin/user_pages/user.html | 6 | ||||
| -rw-r--r-- | user_profile-fix_wrong_nesting.patch | 17 |
2 files changed, 3 insertions, 20 deletions
diff --git a/mediagoblin/templates/mediagoblin/user_pages/user.html b/mediagoblin/templates/mediagoblin/user_pages/user.html index b445d844..7ab2031e 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/user.html +++ b/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 %} 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 %} |