[svn-commits] russell: branch russell/timing_module_priority r176033 - /team/russell/timing...

[SVN commits to the Digium repositories]

Author: russell
Date: Mon Feb 16 09:45:48 2009
New Revision: 176033

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=176033
Log:
remove conflicts that are no longer required

Modified:
    team/russell/timing_module_priority/res/res_timing_timerfd.c

Modified: team/russell/timing_module_priority/res/res_timing_timerfd.c
URL: http://svn.digium.com/svn-view/asterisk/team/russell/timing_module_priority/res/res_timing_timerfd.c?view=diff&rev=176033&r1=176032&r2=176033
==============================================================================
--- team/russell/timing_module_priority/res/res_timing_timerfd.c (original)
+++ team/russell/timing_module_priority/res/res_timing_timerfd.c Mon Feb 16 09:45:48 2009
@@ -25,8 +25,6 @@
 
 /*** MODULEINFO
 	<depend>timerfd</depend>
-	<conflict>res_timing_pthread</conflict>
-	<conflict>res_timing_dahdi</conflict>
  ***/
 
 #include "asterisk.h"