On Sat, Jun 01, 2002 at 12:35:35PM -0600, Michael Moncur wrote:
> Something's wrong with TextCat.pm in the current CVS, looks like a
> misapplied patch. Somewhere around line 65 looks like this:
>
> <<<<<<< TextCat.pm
> open(LM, "/usr/local/share/spamassassin/languages") || die "cannot open
> languages: $!\n\
> and the rules filename is $self->{main}->{rules_filename}\n";
> =======
> open(LM, $self->{main}->{languages_filename}) || die "cannot open
> languages: $!\n";
> >>>>>>> 1.2
>
That's a problem with your local copy. You obviously modified the file
then did a cvs update. The CVS had an updated version of the file in
that section. Choose either the CVS version (the bottom one) or your
version (the top one) to keep.
--
Duncan Findlay
_______________________________________________________________
Don't miss the 2002 Sprint PCS Application Developer's Conference
August 25-28 in Las Vegas -- http://devcon.sprintpcs.com/adp/index.cfm
_______________________________________________
Spamassassin-talk mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/spamassassin-talk
