diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml index 5c2b60ca21..0c4b759db6 100644 --- a/en_US.ISO8859-1/articles/committers-guide/article.sgml +++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml @@ -19,7 +19,7 @@ - $FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.60 2001/04/08 17:26:41 nik Exp $ + $FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.61 2001/04/27 10:07:52 nik Exp $ 1999 @@ -516,11 +516,11 @@ You'll almost certainly get a conflict because - of the $Id: article.sgml,v 1.61 2001-04-27 10:07:52 nik Exp $ (or in FreeBSD's case, + of the $Id: article.sgml,v 1.62 2001-04-27 10:08:44 nik Exp $ (or in FreeBSD's case, $FreeBSD$) lines, so you'll have to edit the file to resolve the conflict (remove the marker lines and - the second $Id: article.sgml,v 1.61 2001-04-27 10:07:52 nik Exp $ line, leaving the original - $Id: article.sgml,v 1.61 2001-04-27 10:07:52 nik Exp $ line intact). + the second $Id: article.sgml,v 1.62 2001-04-27 10:08:44 nik Exp $ line, leaving the original + $Id: article.sgml,v 1.62 2001-04-27 10:08:44 nik Exp $ line intact). diff --git a/en_US.ISO_8859-1/articles/committers-guide/article.sgml b/en_US.ISO_8859-1/articles/committers-guide/article.sgml index 5c2b60ca21..0c4b759db6 100644 --- a/en_US.ISO_8859-1/articles/committers-guide/article.sgml +++ b/en_US.ISO_8859-1/articles/committers-guide/article.sgml @@ -19,7 +19,7 @@ - $FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.60 2001/04/08 17:26:41 nik Exp $ + $FreeBSD: doc/en_US.ISO_8859-1/articles/committers-guide/article.sgml,v 1.61 2001/04/27 10:07:52 nik Exp $ 1999 @@ -516,11 +516,11 @@ You'll almost certainly get a conflict because - of the $Id: article.sgml,v 1.61 2001-04-27 10:07:52 nik Exp $ (or in FreeBSD's case, + of the $Id: article.sgml,v 1.62 2001-04-27 10:08:44 nik Exp $ (or in FreeBSD's case, $FreeBSD$) lines, so you'll have to edit the file to resolve the conflict (remove the marker lines and - the second $Id: article.sgml,v 1.61 2001-04-27 10:07:52 nik Exp $ line, leaving the original - $Id: article.sgml,v 1.61 2001-04-27 10:07:52 nik Exp $ line intact). + the second $Id: article.sgml,v 1.62 2001-04-27 10:08:44 nik Exp $ line, leaving the original + $Id: article.sgml,v 1.62 2001-04-27 10:08:44 nik Exp $ line intact).