diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml index 87e72862dc..d038e8afa8 100644 --- a/en_US.ISO8859-1/articles/committers-guide/article.sgml +++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml @@ -579,11 +579,11 @@ You will almost certainly get a conflict because - of the $Id: article.sgml,v 1.137 2002-10-04 16:13:48 rwatson Exp $ (or in FreeBSD's case, + of the $Id: article.sgml,v 1.138 2002-10-10 17:44:48 bmah 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.137 2002-10-04 16:13:48 rwatson Exp $ line, leaving the original - $Id: article.sgml,v 1.137 2002-10-04 16:13:48 rwatson Exp $ line intact). + the second $Id: article.sgml,v 1.138 2002-10-10 17:44:48 bmah Exp $ line, leaving the original + $Id: article.sgml,v 1.138 2002-10-10 17:44:48 bmah Exp $ line intact). @@ -1257,6 +1257,7 @@ docs:Documentation Bug:nik: &a.steve; &a.rwatson; &a.jhb; + &a.brian &a.bmah;