From b94ae3b783b97e5bd5c10aa88da70e746d7d313c Mon Sep 17 00:00:00 2001
From: Joseph Kocherhans <joseph@jkocherhans.com>
Date: Mon, 17 Sep 2007 15:58:07 +0000
Subject: [PATCH] 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
---
 AUTHORS | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index a41428f4f5..757ef481e9 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -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>