Fixed conflict from previous merge

diff --git a/conf/vanilla/autoload_configs/modules.conf.xml b/conf/vanilla/autoload_configs/modules.conf.xml
index ef40fd19920f1e846fdd89e3cb744f5397b51ace..f88bb7b7c0df15bc760f3431ea58e4605a9aeab4 100644 (file)
--- 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"/>-->