mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-04 09:49:12 +00:00
Code Issues 32 Releases Wiki Activity

newforms-admin: Fixed merge conflict in AUTHORS file.

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@6372 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Joseph Kocherhans 2007-09-17 15:58:07 +00:00
parent 0de9a64905
commit b94ae3b783
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
AUTHORS
View File

@ -198,11 +198,8 @@ answer newbie questions, and generally made Django that much better:
Waylan Limberg <waylan@gmail.com> Waylan Limberg <waylan@gmail.com>
limodou limodou
Philip Lindborg <philip.lindborg@gmail.com> Philip Lindborg <philip.lindborg@gmail.com>
<<<<<<< .working
Simon Litchfield <simon@quo.com.au> Simon Litchfield <simon@quo.com.au>
=======
msaelices <msaelices@gmail.com> msaelices <msaelices@gmail.com>
>>>>>>> .merge-right.r6370
Matt McClanahan <http://mmcc.cx/> Matt McClanahan <http://mmcc.cx/>
Martin Maney <http://www.chipy.org/Martin_Maney> Martin Maney <http://www.chipy.org/Martin_Maney>
Petr Marhoun <petr.marhoun@gmail.com> Petr Marhoun <petr.marhoun@gmail.com>