From eabb065743dad4fc30537ec9ba2cdd1e58cfe694 Mon Sep 17 00:00:00 2001 From: asmodai Date: Wed, 12 Jan 2000 10:26:36 +0000 Subject: Fix conflicts which arose during import, also add $FreeBSD$. --- contrib/groff/man/groff_out.man | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'contrib/groff/man') diff --git a/contrib/groff/man/groff_out.man b/contrib/groff/man/groff_out.man index 57c9b53..225d8b2 100644 --- a/contrib/groff/man/groff_out.man +++ b/contrib/groff/man/groff_out.man @@ -1,6 +1,6 @@ '\" e .ig \"-*- nroff -*- -Copyright (C) 1989-1995 Free Software Foundation, Inc. +Copyright (C) 1989-1999 Free Software Foundation, Inc. Permission is granted to make and distribute verbatim copies of this manual provided the copyright notice and this permission notice @@ -16,6 +16,9 @@ manual into another language, under the above conditions for modified versions, except that this permission notice may be included in translations approved by the Free Software Foundation instead of in the original English. + + $FreeBSD$ + .. .\" This man page must be preprocessed with eqn. .ie \n(.g .ds ic \/ -- cgit v1.1