[imp] CVS error

[Edwin Culp]

Quoting Erik Slooff <erik@slooff.com>:

| Hi all,
| 
| I have noticed a few times that after checking out the CVS of imp I get an 
| error caused by a few lines in lib/IMP.php (around line 304). After deleting 
| these three erratic lines everything works fine. Is this something other
| people 
| have also seen? If not I'll document this with more details.

This usually happens to me when I modify the file in such a way that 
cvs isn't able to merge changes.  I will sometimes just do the following,
when I don't remember why.

# cd horde/imp/lib
# mv IMP.php IMP.php.err
# cvs -z3 update -d
# diff IMP.php IMP.php.err    # To see where the code difference was.

I hope this helps,

ed