[imp] Error after upgrading IMP

[Dave Johnston]

I also receive a similar message after a cvs update when the merging of 
the files did not automatically happen.

Example

Parse error: parse error, unexpected T_SL, expecting ')' in 
/var/lib/apache/secure-docs/horde/jonah/config/templates.php on line 14

and when I look at templates.php I find

<<<<<<< templates.php.dist * $Horde: jonah/config/templates.php.dist,v 
1.6 2003/11/04 21:01:33 chuck Exp $
=======
* $Horde: jonah/config/templates.php.dist,v 1.10 2005/06/21 21:36:17 
chuck Exp $
>>>>>>> 1.10


Removing the appropriate lines manually fixes the problem.

Dave Johnston



Quoting Jan Schneider <jan at horde.org>:

> Zitat von Marco Maiani <m.maiani at comune.scandicci.fi.it>:
>
>> "Parse error: parse error, unexpected T_CONSTANT_ENCAPSED_STRING,
>> expecting ')' in /usr/share/horde3/config/mime_drivers.php on line 298"
>
> You broke the PHP code in the configuration file.
>
> Jan.
>
> --
> Do you need professional PHP or Horde consulting?
> http://horde.org/consulting/
> --
> IMP mailing list - Join the hunt: http://horde.org/bounties/#imp
> Frequently Asked Questions: http://horde.org/faq/
> To unsubscribe, mail: imp-unsubscribe at lists.horde.org
>