Fixed conflict from previous merge

2012-07-25 11:27:01 -04:00 · 2012-07-25 11:27:01 -04:00 · 4585dbffbb
parent 8b0fbe605c
commit 4585dbffbb
1 changed files with 0 additions and 4 deletions
--- 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"/>-->