From 1f010d72ed9d0824998243537e0dd222b42d9fce Mon Sep 17 00:00:00 2001 From: ru Date: Tue, 5 Dec 2000 19:06:41 +0000 Subject: Resolve conflicts after v1.16.1 import. --- contrib/groff/man/groff_out.man | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'contrib/groff/man') diff --git a/contrib/groff/man/groff_out.man b/contrib/groff/man/groff_out.man index 225d8b2..ee9c99c 100644 --- a/contrib/groff/man/groff_out.man +++ b/contrib/groff/man/groff_out.man @@ -1,6 +1,7 @@ '\" e -.ig \"-*- nroff -*- -Copyright (C) 1989-1999 Free Software Foundation, Inc. +.\" The above line should force the use of eqn as a preprocessor +.ig +Copyright (C) 1989-2000 Free Software Foundation, Inc. Permission is granted to make and distribute verbatim copies of this manual provided the copyright notice and this permission notice @@ -233,3 +234,7 @@ should be treated like the part of the line following the command. .SH "SEE ALSO" .BR groff_font (@MAN5EXT@) +.\" +.\" Local Variables: +.\" mode: nroff +.\" End: -- cgit v1.1