Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 5 Jul 2013 22:46:17 +0000 (UTC)
From:      Rene Ladan <rene@FreeBSD.org>
To:        doc-committers@freebsd.org, svn-doc-projects@freebsd.org
Subject:   svn commit: r42167 - projects/entities/en_US.ISO8859-1/htdocs
Message-ID:  <201307052246.r65MkHpH010974@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307052246.r65MkHpH010974>