Resolve conflicts and remove unuseful CVS tags in comment.

This commit is contained in:
Akinori MUSHA 2002-04-10 20:13:19 +00:00
parent 30bca670f7
commit c54344a6cc
Notes: svn2git 2020-12-08 03:00:23 +00:00
svn path=/www/; revision=12742
4 changed files with 7 additions and 11 deletions

View file

@ -4,13 +4,12 @@
#
# (c) 1998-1999 H. Zeller <zeller@think.de>
# 1999 H. Nordstrom <hno@hem.passagen.se>
# 2000-2001 A. MUSHA <knu@FreeBSD.org>
# 2000-2002 A. MUSHA <knu@FreeBSD.org>
# based on work by Bill Fenner <fenner@FreeBSD.org>
#
# FreeBSD: projects/cvsweb/cvsweb.conf,v 1.29 2001/10/11 15:20:03 knu Exp
# $Id: cvsweb.conf,v 1.25 2002-03-09 20:55:39 wosch Exp $
# $Id: cvsweb.conf,v 1.26 2002-04-10 20:13:19 knu Exp $
# $Idaemons: /home/cvs/cvsweb/cvsweb.conf,v 1.27 2001/08/01 09:48:39 knu Exp $
# $FreeBSD: www/en/cgi/cvsweb.conf,v 1.24 2001/11/07 21:25:16 knu Exp $
# $FreeBSD: www/en/cgi/cvsweb.conf,v 1.25 2002/03/09 20:55:39 wosch Exp $
#
###
@ -158,7 +157,7 @@ $logo = '';
$defaulttitle = "CVS Repository";
# The address is shown on the footer
$address = "<font size=-1>CVSweb by &lt;knu\@FreeBSD.org&gt;</font>";
$address = '<font size="-1">CVSweb by &lt;knu@FreeBSD.org&gt;</font>';
# color of navigation Header for
# diffs and annotations

View file

@ -2,9 +2,8 @@
#
# Set up for FreeBSD repo options.
#
# FreeBSD: projects/cvsweb/cvsweb.conf-freebsd,v 1.7 2001/11/07 20:37:56 knu Exp
# $Idaemons: /home/cvs/cvsweb/cvsweb.conf-freebsd,v 1.5 2001/08/01 09:32:22 knu Exp $
# $FreeBSD: www/en/cgi/cvsweb.conf-freebsd,v 1.8 2001/08/01 10:41:47 knu Exp $
# $FreeBSD: www/en/cgi/cvsweb.conf-freebsd,v 1.9 2001/11/07 21:25:16 knu Exp $
if ($uname eq 'FreeBSD') {
$ENV{'RCSLOCALID'} = 'FreeBSD=CVSHeader';

View file

@ -2,9 +2,8 @@
#
# Set up for NetBSD repo options.
#
# FreeBSD: projects/cvsweb/cvsweb.conf-netbsd,v 1.6 2001/10/11 15:15:12 knu Exp
# $Idaemons: /home/cvs/cvsweb/cvsweb.conf-netbsd,v 1.5 2001/08/01 09:32:22 knu Exp $
# $FreeBSD: www/en/cgi/cvsweb.conf-netbsd,v 1.9 2001/08/01 10:41:47 knu Exp $
# $FreeBSD: www/en/cgi/cvsweb.conf-netbsd,v 1.10 2001/11/07 21:25:16 knu Exp $
if ($uname eq 'FreeBSD') {
$ENV{'RCSLOCALID'} = 'NetBSD=CVSHeader';

View file

@ -2,9 +2,8 @@
#
# Set up for OpenBSD repo options.
#
# FreeBSD: projects/cvsweb/cvsweb.conf-openbsd,v 1.6 2001/10/11 15:15:12 knu Exp
# $Idaemons: /home/cvs/cvsweb/cvsweb.conf-openbsd,v 1.5 2001/08/01 09:32:22 knu Exp $
# $FreeBSD: www/en/cgi/cvsweb.conf-openbsd,v 1.7 2001/08/01 10:41:47 knu Exp $
# $FreeBSD: www/en/cgi/cvsweb.conf-openbsd,v 1.8 2001/11/07 21:25:16 knu Exp $
if ($uname eq 'FreeBSD') {
$ENV{'RCSLOCALID'} = 'OpenBSD=CVSHeader';