merged

CHANGELOG.md

 Upcoming version:
 -----------------
+  - merged (Nikolaus Krismer)
   - version upgrade of apache-tomcat (Nikolaus Krismer)
   - version upgrade of apache-tomcat (Nikolaus Krismer)
   - version upgrade of apache-tomcat (Nikolaus Krismer)

bootstrap/prepareEnvironment.sh

@@ -792,11 +792,7 @@ fi
 
 if $INSTALL_SPATIALITE_ADMIN; then
 	# TODO: Check this (does not seem to work)
-<<<<<<< HEAD
 	# TODO: What to do if there are multiple target_srid defined?
-=======
-	# TODO: What to do if there are multiple target_srid defined
->>>>>>> 8b36dab25de690b11838ff650c718406021fcf6a
 	fn_echo "Configuring phpLiteAdmin"
 	cp $DEPLOY_DIR/phpliteadmin/phpliteadmin.config.sample.php $DEPLOY_DIR/phpliteadmin/phpliteadmin.config.php
 	sed -i "s/password = 'admin'/password = '${TOMCAT_PASSWORD}'/" $DEPLOY_DIR/phpliteadmin/phpliteadmin.config.php