From 2f6dcebf2d5fda610671c22ef3131070e8a435ad Mon Sep 17 00:00:00 2001 From: Mark Linimon Date: Wed, 9 Nov 2005 22:20:49 +0000 Subject: [PATCH] Whitespace change. Translators please ignore. --- .../articles/committers-guide/article.sgml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml index 5c87f2f1be..73226a69c2 100644 --- a/en_US.ISO8859-1/articles/committers-guide/article.sgml +++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml @@ -729,11 +729,11 @@ alias scvs env CVS_RSH=ssh cvs -d user@ncvs.FreeBSD.o You will almost certainly get a conflict because - of the $Id: article.sgml,v 1.232 2005-11-09 22:18:52 linimon Exp $ (or in FreeBSD's case, + of the $Id: article.sgml,v 1.233 2005-11-09 22:20:49 linimon Exp $ (or in FreeBSD's case, $FreeBSD$) lines, so you will have to edit the file to resolve the conflict - (remove the marker lines and the second $Id: article.sgml,v 1.232 2005-11-09 22:18:52 linimon Exp $ line, - leaving the original $Id: article.sgml,v 1.232 2005-11-09 22:18:52 linimon Exp $ line intact). + (remove the marker lines and the second $Id: article.sgml,v 1.233 2005-11-09 22:20:49 linimon Exp $ line, + leaving the original $Id: article.sgml,v 1.233 2005-11-09 22:20:49 linimon Exp $ line intact). @@ -2804,10 +2804,10 @@ docs:Documentation Bug:freebsd-doc: - adding the following files into - distrib/cvsup/sup/ports-categoryname: - list.cvs and - releases. + adding the following files into + distrib/cvsup/sup/ports-categoryname: + list.cvs and + releases.