diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-08-10 19:53:37 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2011-08-10 19:53:37 -0500 |
| commit | 852d5bb2387706c11925fa0c2abe4a1f34708f16 (patch) | |
| tree | df5e6a3108d2ba007112b558ff65bbfabd88020c /user_profile-fix_wrong_nesting.patch | |
| parent | 6b9ee0ca13b99ee20f9d0c680a950c6a7494a5a0 (diff) | |
| parent | 6d794f268bb1f5d3cc56c5f0dc902571d48ebeac (diff) | |
| download | mediagoblin-852d5bb2387706c11925fa0c2abe4a1f34708f16.tar.lz mediagoblin-852d5bb2387706c11925fa0c2abe4a1f34708f16.tar.xz mediagoblin-852d5bb2387706c11925fa0c2abe4a1f34708f16.zip | |
Merge branch 'master' into processing
Diffstat (limited to 'user_profile-fix_wrong_nesting.patch')
| -rw-r--r-- | user_profile-fix_wrong_nesting.patch | 17 |
1 files changed, 0 insertions, 17 deletions
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 %} |