From owner-svn-doc-projects@FreeBSD.ORG  Fri Jul  5 22:46:17 2013
Return-Path: <owner-svn-doc-projects@FreeBSD.ORG>
Delivered-To: svn-doc-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 932DE251;
 Fri,  5 Jul 2013 22:46:17 +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 84723191A;
 Fri,  5 Jul 2013 22:46:17 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r65MkH61010975;
 Fri, 5 Jul 2013 22:46:17 GMT (envelope-from rene@svn.freebsd.org)
Received: (from rene@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r65MkHpH010974;
 Fri, 5 Jul 2013 22:46:17 GMT (envelope-from rene@svn.freebsd.org)
Message-Id: <201307052246.r65MkHpH010974@svn.freebsd.org>
From: Rene Ladan <rene@FreeBSD.org>
Date: Fri, 5 Jul 2013 22:46:17 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject: svn commit: r42167 - projects/entities/en_US.ISO8859-1/htdocs
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 22:46:17 -0000

Author: rene
Date: Fri Jul  5 22:46:17 2013
New Revision: 42167
URL: http://svnweb.freebsd.org/changeset/doc/42167

Log:
  Fix a mismerge.

Modified:
  projects/entities/en_US.ISO8859-1/htdocs/administration.xml

Modified: projects/entities/en_US.ISO8859-1/htdocs/administration.xml
==============================================================================
--- projects/entities/en_US.ISO8859-1/htdocs/administration.xml	Fri Jul  5 21:12:42 2013	(r42166)
+++ projects/entities/en_US.ISO8859-1/htdocs/administration.xml	Fri Jul  5 22:46:17 2013	(r42167)
@@ -129,8 +129,8 @@
     <li>&a.tabthorpe.email;</li>
     <li>&a.marcus.email;</li>
     <li>&a.bapt.email;</li>
-    <li>&a.bdrewery.email;</li>
-    <li>&a.decke.email; (Release Engineering Team Liaison)</li>
+    <li>&a.bdrewery.email; (Release Engineering Team Liaison)</li>
+    <li>&a.decke.email;</li>
     <li>&a.erwin.email; (Cluster Administration Team Liaison)</li>
     <li>&a.itetcu.email;</li>
     <li>&a.miwi.email;</li>