Fixed conflict

Xdebug for local debugging.
BetterBrief · Mar 6, 2015 · 441a6ff · 441a6ff
2 parents cc6d131 + bd45802
commit 441a6ff
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/scripts/php-54.sh b/scripts/php-54.sh
@@ -3,7 +3,7 @@
 PHP_NAME="php"
 
 # declare the php modules we want
-MODULES=(common mysql gd mbstring xml tidy)
+MODULES=(common mysql gd mbstring xml tidy pear devel)
 
 echo "Installing PHP and common modules"
 yum install -y $PHP_NAME ${MODULES[@]/#/$PHP_NAME-}

diff --git a/scripts/php-55.sh b/scripts/php-55.sh
@@ -3,7 +3,7 @@
 PHP_NAME="php55w"
 
 # declare the php modules we want
-MODULES=(common mysql gd mbstring xml tidy)
+MODULES=(common mysql gd mbstring xml tidy pear devel)
 
 /vagrant/scripts/epel.sh
 

diff --git a/scripts/xdebug.sh b/scripts/xdebug.sh
@@ -10,13 +10,21 @@
 # 7. Aply and done!
 
 echo "Install Xdebug"
+<<<<<<< HEAD
 yum install -y gcc gcc-c++ autoconf automake
+=======
+yum install -y gcc gcc-c++ autoconf automake --enablerepo=epel --enablerepo=webtatic
+>>>>>>> bd45802707205f028b37227aa70fa1eac89494a4
 
 pecl install Xdebug
 if [ ! -f /etc/php.d/xdebug.ini ]
 then
     echo "[xdebug]
     zend_extension=\"/usr/lib64/php/modules/xdebug.so\"
     xdebug.remote_connect_back = 1
+<<<<<<< HEAD
     xdebug.remote_enable = 1" > /etc/php.d/xdebug.ini
+=======
+    xdebug.remote_enable = 1" >> /etc/php.d/xdebug.ini
+>>>>>>> bd45802707205f028b37227aa70fa1eac89494a4
 fi