[imp] IMP/CVS broken?

[Marc G. Fournier]

On Mon, 29 Apr 2002, Chuck Hagenbuch wrote:

> Quoting "Marc G. Fournier" <scrappy@hub.org>:
>
> > Parse error: parse error in /usr/local/www/horde/lib/MIME/Part.php on
> > line 2
> >
> > Parse error: parse error in /usr/local/www/horde/lib/MIME/Viewer.php on
> > line 2
> >
> > Parse error: parse error in /usr/local/www/horde/lib/Identity.php on
> > line 2
>
> Did you look at those line numbers? Sounds like you had a bad merge
> somehow...

Actually, ended up having to remove a whole whack of C)onflict files that
I never noticed earlier ...