From caf6a1022777612b746c1274ee086af24a58093b Mon Sep 17 00:00:00 2001 From: Michael T Date: Wed, 21 Sep 2016 15:27:09 -0700 Subject: [PATCH] grr.. Fixed git commit message stuck in file. (#2659) --- snipeit.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/snipeit.sh b/snipeit.sh index ae530bf25e03..ed5656c7514e 100755 --- a/snipeit.sh +++ b/snipeit.sh @@ -289,11 +289,8 @@ case $distro in echo "" progress if [ "$version" == "16.04" ]; then -<<<<<<< HEAD sudo apt-get install -y git unzip php php-mcrypt php-curl php-mysql php-gd php-ldap php-zip php-mbstring php-xml >> /var/log/snipeit-install.log 2>&1 -======= sudo apt-get install -y git unzip php php-mcrypt php-curl php-mysql php-gd php-ldap php-xml php-zip php-mbstring >> /var/log/snipeit-install.log 2>&1 ->>>>>>> 7fdd4fbe987a00138f2e4b1695d67d3069bc1359 #Enable mcrypt and rewrite echo "## Enabling mcrypt and rewrite" sudo phpenmod mcrypt >> /var/log/snipeit-install.log 2>&1