heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix merge conflict in user.html

Browse Source
This commit is contained in:
Jef van Schendel 2011-07-25 22:37:02 +02:00
commit 00458460d9
2 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mediagoblin/templates/mediagoblin/user_pages/user.html
View File

@ -41,10 +41,10 @@
<a href={{ request.urlgen(
'mediagoblin.user_pages.atom_feed',
user=user.username) }}>atom feed</a>
</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/>
</div>
<div class="clear"></div>
{% endif %}
{% endblock %}

17
user_profile-fix_wrong_nesting.patch
View File

@ -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 %}