[svn-commits] file: testsuite/asterisk/trunk r5402 - /asterisk/trunk/configs/conflicts.txt

[SVN commits to the Digium repositories]

Author: file
Date: Fri Aug  8 15:17:18 2014
New Revision: 5402

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=5402
Log:
Add res_pjsip_outbound_publish as a conflict so it does not get loaded when chan_sip is in use.

Modified:
    asterisk/trunk/configs/conflicts.txt

Modified: asterisk/trunk/configs/conflicts.txt
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/configs/conflicts.txt?view=diff&rev=5402&r1=5401&r2=5402
==============================================================================
--- asterisk/trunk/configs/conflicts.txt (original)
+++ asterisk/trunk/configs/conflicts.txt Fri Aug  8 15:17:18 2014
@@ -10,4 +10,4 @@
 res_pjsip=chan_sip.so
 
 ;; and don't load chan_pjsip if the test uses chan_sip
-chan_sip=chan_pjsip.so,res_pjsip.so,res_pjsip_pubsub.so,res_pjsip_session.so
+chan_sip=chan_pjsip.so,res_pjsip.so,res_pjsip_pubsub.so,res_pjsip_session.so,res_pjsip_outbound_publish.so