From owner-svn-doc-projects@FreeBSD.ORG  Fri Jul  5 23:19:11 2013
Return-Path: <owner-svn-doc-projects@FreeBSD.ORG>
Delivered-To: svn-doc-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 5E8EFAC2;
 Fri,  5 Jul 2013 23:19:11 +0000 (UTC)
 (envelope-from rene@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 504E51A53;
 Fri,  5 Jul 2013 23:19:11 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r65NJBCC020453;
 Fri, 5 Jul 2013 23:19:11 GMT (envelope-from rene@svn.freebsd.org)
Received: (from rene@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r65NJB6m020452;
 Fri, 5 Jul 2013 23:19:11 GMT (envelope-from rene@svn.freebsd.org)
Message-Id: <201307052319.r65NJB6m020452@svn.freebsd.org>
From: Rene Ladan <rene@FreeBSD.org>
Date: Fri, 5 Jul 2013 23:19:11 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r42169 -
 projects/entities/en_US.ISO8859-1/articles/contributors
X-SVN-Group: doc-projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-doc-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for doc projects trees
 <svn-doc-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-projects>
List-Post: <mailto:svn-doc-projects@freebsd.org>
List-Help: <mailto:svn-doc-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-projects>, 
 <mailto:svn-doc-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Jul 2013 23:19:11 -0000

Author: rene
Date: Fri Jul  5 23:19:10 2013
New Revision: 42169
URL: http://svnweb.freebsd.org/changeset/doc/42169

Log:
  Fix another mismerge (r41197).

Modified:
  projects/entities/en_US.ISO8859-1/articles/contributors/contrib.committers.xml

Modified: projects/entities/en_US.ISO8859-1/articles/contributors/contrib.committers.xml
==============================================================================
--- projects/entities/en_US.ISO8859-1/articles/contributors/contrib.committers.xml	Fri Jul  5 22:51:16 2013	(r42168)
+++ projects/entities/en_US.ISO8859-1/articles/contributors/contrib.committers.xml	Fri Jul  5 23:19:10 2013	(r42169)
@@ -188,10 +188,6 @@
     </listitem>
 
     <listitem>
-      <para>&a.carvay.email;</para>
-    </listitem>
-
-    <listitem>
       <para>&a.gahr.email;</para>
     </listitem>