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

Forced commit.

Browse source 
r1.159 also removed a link to the send-pr.html page, as this is no
longer useful.
This commit is contained in:
Ceri Davies 2003-03-01 22:30:06 +00:00
parent f30a5cf6c8
commit 3862f17080
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=16161
1 changed files with 3 additions and 3 deletions

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

@ -608,11 +608,11 @@
</itemizedlist>
<para>You will almost certainly get a conflict because
of the <literal>$Id: article.sgml,v 1.159 2003-03-01 22:24:58 ceri Exp $</literal> (or in FreeBSD's case,
of the <literal>$Id: article.sgml,v 1.160 2003-03-01 22:30:06 ceri Exp $</literal> (or in FreeBSD's case,
<literal>$<!-- stop expansion -->FreeBSD<!-- stop expansion -->$</literal>)
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.159 2003-03-01 22:24:58 ceri Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.159 2003-03-01 22:24:58 ceri Exp $</literal> line intact).</para>
(remove the marker lines and the second <literal>$Id: article.sgml,v 1.160 2003-03-01 22:30:06 ceri Exp $</literal> line,
leaving the original <literal>$Id: article.sgml,v 1.160 2003-03-01 22:30:06 ceri Exp $</literal> line intact).</para>
</listitem>
<listitem>