Sigh. Fix broken merges. I hate CVS.

This commit is contained in:
Mark Murray 1999-01-15 12:06:17 +00:00
parent 6af24c708d
commit 43a16e4327
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=42696

View File

@ -1,5 +1,5 @@
% texinfo.tex -- TeX macros to handle Texinfo files.
% $Id: texinfo.tex,v 2.227 1998/02/25 22:54:34 karl Exp $
% $Id$
%
% Copyright (C) 1985, 86, 88, 90, 91, 92, 93, 94, 95, 96, 97, 98
% Free Software Foundation, Inc.