os/doc
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Whitespace change. Translators please ignore.

Browse source
This commit is contained in:
Mark Linimon 2005-11-09 22:20:49 +00:00
parent 4b523874e0
commit 2f6dcebf2d
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=26308
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
en_US.ISO8859-1/articles/committers-guide/article.sgml
View file

@ -729,11 +729,11 @@ alias scvs env CVS_RSH=ssh cvs -d <replaceable>user</replaceable>@ncvs.FreeBSD.o
</itemizedlist> </itemizedlist>
<para>You will almost certainly get a conflict because <para>You will almost certainly get a conflict because
of the <literal>$Id: article.sgml,v 1.232 2005-11-09 22:18:52 linimon Exp $</literal> (or in FreeBSD's case, of the <literal>$Id: article.sgml,v 1.233 2005-11-09 22:20:49 linimon Exp $</literal> (or in FreeBSD's case,
<literal>$<!-- stop expansion -->FreeBSD<!-- stop expansion -->$</literal>) <literal>$<!-- stop expansion -->FreeBSD<!-- stop expansion -->$</literal>)
lines, so you will have to edit the file to resolve the conflict lines, so you will have to edit the file to resolve the conflict
(remove the marker lines and the second <literal>$Id: article.sgml,v 1.232 2005-11-09 22:18:52 linimon Exp $</literal> line, (remove the marker lines and the second <literal>$Id: article.sgml,v 1.233 2005-11-09 22:20:49 linimon Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.232 2005-11-09 22:18:52 linimon Exp $</literal> line intact).</para> leaving the original <literal>$Id: article.sgml,v 1.233 2005-11-09 22:20:49 linimon Exp $</literal> line intact).</para>
</listitem> </listitem>
<listitem> <listitem>