Merge branch 'feature/Enable_Xdebug' of github.com:Firesphere/vagrant…

…-skeleton into feature/Enable_Xdebug Conflicts: scripts/php-54.sh scripts/php-55.sh
BetterBrief · Mar 6, 2015 · 9c1abfb · 9c1abfb
2 parents 441a6ff + 894dfd2
commit 9c1abfb
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/scripts/xdebug.sh b/scripts/xdebug.sh
@@ -10,21 +10,13 @@
 # 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