[asterisk-commits] jpeeler: trunk r177356 - /trunk/main/features.c

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Thu Feb 19 09:56:31 2009
New Revision: 177356

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=177356
Log:
Fix mismerge from revision 176708 pointed out by Kaloyan Kovachev on the
asterisk-dev mailing list. Thanks!


Modified:
    trunk/main/features.c

Modified: trunk/main/features.c
URL: http://svn.digium.com/svn-view/asterisk/trunk/main/features.c?view=diff&rev=177356&r1=177355&r2=177356
==============================================================================
--- trunk/main/features.c (original)
+++ trunk/main/features.c Thu Feb 19 09:56:31 2009
@@ -2542,7 +2542,6 @@
 				config->feature_timer -= diff;
 			}
 
-			config->feature_timer -= diff;
 			if (hasfeatures) {
 				/* Running on backup config, meaning a feature might be being
 				   activated, but that's no excuse to keep things going