update latest

Author: mevdschee

01-installation.md

@@ -23,24 +23,15 @@ MintyPHP supports MariaDB (and other MySQL compatible databases).
 You can download the latest version as a zip archive by clicking the button below.
 
 <br>
-<<<<<<< HEAD
 <a href='http://github.com/mintyphp/mintyphp/archive/v.zip' style="text-decoration: none; color: white; background-color: #21a900; padding: 10px 20px;">Download MintyPHP v</a>
-=======
-<a href='http://github.com/mintyphp/mintyphp/archive/v2.0.4.zip' style="text-decoration: none; color: white; background-color: #21a900; padding: 10px 20px;">Download MintyPHP v2.0.4</a>
->>>>>>> 1a66369292aa0e5ac4dc25bafb572a8fbc91c7c6
 <br>
 <br>
 
 Unzip the archive and run the start.sh script with the following command:
 
 ```
-<<<<<<< HEAD
 unzip mintyphp-.zip
 cd mintyphp-
-=======
-unzip mintyphp-2.0.4.zip
-cd mintyphp-2.0.4
->>>>>>> 1a66369292aa0e5ac4dc25bafb572a8fbc91c7c6
 bash start.sh
 ```
 

update.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 VERSION=$(curl -s https://github.com/mintyphp/mintyphp/releases | grep -iA 20 'latest' | grep -o 'v[0-9]\+\.[0-9]\+\.[0-9]\+')
-VERSION="${VERSION//\"}" # strip quote character
 VERSION="${VERSION//v}" # strip v character
 OLDVER=$(cat version.txt)
 echo $VERSION > version.txt