Permalink
Browse files

Merge branch 'master' of github.com:pydanny/whydjango

  • Loading branch information...
2 parents 7026f54 + 5801218 commit db66f742062ca26f5e556126e9104529c7390845 @audreyr audreyr committed Sep 10, 2010
@@ -24,6 +24,4 @@
</div>
-{% show_bookmarks object.title object %}
-
{% endblock col1_content %}
@@ -12,6 +12,5 @@
{{ flatpage.content|safe }}
- {% show_bookmarks flatpage.title flatpage %}
{% endblock col1_content %}
@@ -33,7 +33,6 @@
<div class="col1_content">
{{ flatpage.content|safe }}
-{% show_bookmarks flatpage.title flatpage %}
</div>

0 comments on commit db66f74

Please sign in to comment.