From 2f10715d2a2ce1242e2170a33f6f7502ccd60df2 Mon Sep 17 00:00:00 2001
From: Nikolaus Krismer <nikolaus.krismer@uibk.ac.at>
Date: Thu, 30 Jun 2016 09:07:47 +0200
Subject: [PATCH] merged
---
CHANGELOG.md | 1 +
bootstrap/prepareEnvironment.sh | 4 ----
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 72cca92..ece4261 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
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)
diff --git a/bootstrap/prepareEnvironment.sh b/bootstrap/prepareEnvironment.sh
index 9542115..f4c5241 100755
--- a/bootstrap/prepareEnvironment.sh
+++ b/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
--
GitLab