Changeset 6372

Timestamp:

09/17/07 10:58:07 (1 year ago)

Author:

jkocherhans

Message:

newforms-admin: Fixed merge conflict in AUTHORS file.

Files:

• django/branches/newforms-admin/AUTHORS (modified) (1 diff)

django/branches/newforms-admin/AUTHORS

@@ -199 +199 @@
-    limodou
-    Philip Lindborg <philip.lindborg@gmail.com>
-<<<<<<< .working
-    Simon Litchfield <simon@quo.com.au>
-=======
-    msaelices <msaelices@gmail.com>
->>>>>>> .merge-right.r6370
-    Matt McClanahan <http://mmcc.cx/>
-    Martin Maney <http://www.chipy.org/Martin_Maney>