Re: [PyWrapper-devel] Startup problem

[Javier de la T. <ja...@gm...>]

Milko,

This lines you get them when you have a conflict on subversion. That  
means that you edited these files and then markus edited them too and  
commit it to the svn server. When you have updated SVN detects that  
you have a conflict and create a set of files with the differet  
versions conflicting and with comments for you to decide what you  
wanna do... is not a pywrapper error is just that you have a crash in  
svn.

Simply delete all these files and update to restore them again...

Javi

On 16/11/2006, at 10:46, Skofic A. Milko (IPGRI) wrote:

> I just looked at the configuration file in the server and here it is:
>
> #  
> ---------------------------------------------------------------------- 
> ----------
> # INSTALLATION WIDE CONFIGURATION
> # PLEASE ADJUST THESE SETTINGS TO YOUR ENVIRONMENT
> #  
> ---------------------------------------------------------------------- 
> ----------
>
> [Server]
> adminpassword  =  ACDC
> graphviz_dot  =
> host  =  http://tapir.grinfo.net:8080
> webapp  =  True
> webroot  =  /pywrapper
> # time in minutes. 0 forces a reload every time
> cacheExpiration = 60
>
> [ConceptNameServer]
> AliasList_1  =  http://rs.tdwg.org/tapir/cns/alias.txt
> AliasList_2  =  http://eurisco.ecpgr.org/models/alias.txt
> AliasList_3  =
>
> [Webapps]
> <<<<<<< .mine
> sessionExpiration  =  3600
> =======
> # time in minutes
> sessionExpiration = 60
> >>>>>>> .r983
>
> From the error messages it looks as if it doesn't like the  
> <<<<<<< .mine lines...