diff options
| author | Joseph Kocherhans <joseph@jkocherhans.com> | 2007-09-17 15:58:07 +0000 |
|---|---|---|
| committer | Joseph Kocherhans <joseph@jkocherhans.com> | 2007-09-17 15:58:07 +0000 |
| commit | b94ae3b783b97e5bd5c10aa88da70e746d7d313c (patch) | |
| tree | 19727a9c5bee62d32bbf09d8b73b26b0d55cf424 | |
| parent | 0de9a6490577432b9d6204097ac22f57d9c60981 (diff) | |
newforms-admin: Fixed merge conflict in AUTHORS file.
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@6372 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | AUTHORS | 3 |
1 files changed, 0 insertions, 3 deletions
@@ -198,11 +198,8 @@ answer newbie questions, and generally made Django that much better: Waylan Limberg <waylan@gmail.com> 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> Petr Marhoun <petr.marhoun@gmail.com> |