Author: jkocherhans
Date: 2007-09-17 10:58:07 -0500 (Mon, 17 Sep 2007)
New Revision: 6372
Modified:
django/branches/newforms-admin/AUTHORS
Log:
newforms-admin: Fixed merge conflict in AUTHORS file.
Modified: django/branches/newforms-admin/AUTHORS
===================================================================
--- django/branches/newforms-admin/AUTHORS 2007-09-17 15:49:03 UTC (rev
6371)
+++ django/branches/newforms-admin/AUTHORS 2007-09-17 15:58:07 UTC (rev
6372)
@@ -198,11 +198,8 @@
Waylan Limberg <[EMAIL PROTECTED]>
limodou
Philip Lindborg <[EMAIL PROTECTED]>
-<<<<<<< .working
Simon Litchfield <[EMAIL PROTECTED]>
-=======
msaelices <[EMAIL PROTECTED]>
->>>>>>> .merge-right.r6370
Matt McClanahan <http://mmcc.cx/>
Martin Maney <http://www.chipy.org/Martin_Maney>
Petr Marhoun <[EMAIL PROTECTED]>
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
