DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-21 03:15:45 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

grr.. Fixed git commit message stuck in file. (#2659)

Browse source
This commit is contained in:
Michael T 2016-09-21 15:27:09 -07:00 committed by snipe
parent 580091269d
commit caf6a10227
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
snipeit.sh
View file

@ -289,11 +289,8 @@ case $distro in
echo "" echo ""
progress progress
if [ "$version" == "16.04" ]; then 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-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 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 #Enable mcrypt and rewrite
echo "## Enabling mcrypt and rewrite" echo "## Enabling mcrypt and rewrite"
sudo phpenmod mcrypt >> /var/log/snipeit-install.log 2>&1 sudo phpenmod mcrypt >> /var/log/snipeit-install.log 2>&1