Commit 45ac039

committed

Resolved conflicts while switch to php5.6

1 parent 272f0b9 commit 45ac039Copy full SHA for 45ac039

File tree

-1

lines changed

-1

lines changed

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,12 @@`
`3`	`3`	`echo "* Disabling Apache PHP 7.0 module..."`
`4`	`4`	`sudo a2dismod php7.0 > /dev/null`
`5`	`5`
	`6`	`+echo "* Disabling Apache PHP 7.1 module..."`
	`7`	`+sudo a2dismod php7.1 > /dev/null`
	`8`	`+`
	`9`	`+echo "* Disabling Apache PHP 7.2 module..."`
	`10`	`+sudo a2dismod php7.2 > /dev/null`
	`11`	`+`
`6`	`12`	`echo "* Enabling Apache PHP 5.6 module..."`
`7`	`13`	`sudo a2enmod php5.6 > /dev/null`
`8`	`14`
`@@ -12,4 +18,4 @@ sudo service apache2 restart > /dev/null`
`12`	`18`	`echo "* Switching CLI PHP to 5.6..."`
`13`	`19`	`sudo update-alternatives --set php /usr/bin/php5.6 > /dev/null`
`14`	`20`
`15`		`-echo "* Switch to PHP 5.6 complete."`
	`21`	`+echo "* Switch to PHP 5.6 complete."`

Comments

(0)