[PyWrapper-devel] Startup problem

[Skofic A. M. (IPGRI) <m.s...@cg...>]

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...