From: David Yat Sin <dyatsin@sangoma.com>
Date: Wed, 25 Jul 2012 15:27:01 +0000 (-0400)
Subject: Fixed conflict from previous merge
X-Git-Tag: v1.2.3^2~71^2^2~131^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4585dbffbbdd210cbe5c56a1f90a5236cc50a042;p=thirdparty%2Ffreeswitch.git

Fixed conflict from previous merge
---

diff --git a/conf/vanilla/autoload_configs/modules.conf.xml b/conf/vanilla/autoload_configs/modules.conf.xml
index ef40fd1992..f88bb7b7c0 100644
--- a/conf/vanilla/autoload_configs/modules.conf.xml
+++ b/conf/vanilla/autoload_configs/modules.conf.xml
@@ -82,11 +82,7 @@
     <load module="mod_g723_1"/>
     <load module="mod_g729"/>
     <load module="mod_amr"/>
-<<<<<<< HEAD
-    <!--    <load module="mod_ilbc"/> -->
-=======
     <!--<load module="mod_ilbc"/>-->
->>>>>>> eb0404d0256dee4696b3ae1b62c4b1cef9327a0d
     <load module="mod_speex"/>
     <load module="mod_h26x"/>
     <!--<load module="mod_siren"/>-->