Index: openacs.org-dev/packages/irc-logger/perl/logger
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/irc-logger/perl/logger,v
diff -u -r1.2 -r1.3
--- openacs.org-dev/packages/irc-logger/perl/logger 4 Feb 2003 19:13:35 -0000 1.2
+++ openacs.org-dev/packages/irc-logger/perl/logger 11 Feb 2003 23:24:47 -0000 1.3
@@ -607,7 +607,11 @@
IRC log of $escaped_chan on $date
EOT
+<<<<<<< logger
my $progID = '$Id$';
+=======
+ my $progID = '$Id$';
+>>>>>>> 1.1.1.1
$progID =~ s/\$/\$/g; # Hide the CVS tag from CVS in the output
print $html_log_fh '';
print $html_log_fh <<"EOT";
@@ -2100,7 +2104,11 @@
}
my $progname = basename(__FILE__);
+<<<<<<< logger
my $CVSRevision = '$Revision$'; # capture CVS info here
+=======
+ my $CVSRevision = '$Revision$'; # capture CVS info here
+>>>>>>> 1.1.1.1
$CVSRevision =~ s/\$//g; # drop '$' for W3C site repository checkin
my $datetime = strftime( '%Y-%m-%dT%H:%MZ', gmtime );