Author: jacob
Date: 2008-07-11 13:10:10 -0500 (Fri, 11 Jul 2008)
New Revision: 7896
Modified:
djangoproject.com/django_website/templates/flatpages/foundation.html
Log:
[djangoproject.com] resolved a silly conflict. This is whay you should avoid
editing stuff on the server, kids!
Modified: djangoproject.com/django_website/templates/flatpages/foundation.html
===================================================================
--- djangoproject.com/django_website/templates/flatpages/foundation.html
2008-07-11 18:06:48 UTC (rev 7895)
+++ djangoproject.com/django_website/templates/flatpages/foundation.html
2008-07-11 18:10:10 UTC (rev 7896)
@@ -19,4 +19,4 @@
{% block content %}
<h1>{{ flatpage.title }}</h1>
{{ flatpage.content }}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
