From 062650fb1fff96d3ed6404ba4285fcd6eb1c1ca0 Mon Sep 17 00:00:00 2001
From: tbergervoet <t.bergervoet@ictmaatwerk.com>
Date: Wed, 17 Oct 2018 14:40:41 +0200
Subject: [PATCH] Update 'RevProxySimple.sh'

---
 RevProxySimple.sh | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/RevProxySimple.sh b/RevProxySimple.sh
index 947981e..ab2f17b 100644
--- a/RevProxySimple.sh
+++ b/RevProxySimple.sh
@@ -26,10 +26,6 @@ chmod -R 755 /var/www
 apt install -y nginx mysql-server-5.7
 # mysql_secure_installation automated
 mysqladmin -u root password "$password"
-<<<<<<< HEAD
-mysql -u root -p"$password" -e "UPDATE mysql.user SET Password=PASSWORD('$password') WHERE User='root'"
-=======
->>>>>>> dev
 mysql -u root -p"$password" -e "DELETE FROM mysql.user WHERE User='root' AND Host NOT IN ('localhost', '127.0.0.1', '::1')"
 mysql -u root -p"$password" -e "DELETE FROM mysql.user WHERE User=''"
 mysql -u root -p"$password" -e "DELETE FROM mysql.db WHERE Db='test' OR Db='test\_%'"