[asterisk-commits] jpeeler: branch 1.6.0 r177357 - in /branches/1.6.0: ./ main/features.c

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Thu Feb 19 09:57:16 2009
New Revision: 177357

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=177357
Log:
Merged revisions 177356 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r177356 | jpeeler | 2009-02-19 09:56:31 -0600 (Thu, 19 Feb 2009) | 4 lines
  
  Fix mismerge from revision 176708 pointed out by Kaloyan Kovachev on the
  asterisk-dev mailing list. Thanks!
........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/features.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/main/features.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.0/main/features.c?view=diff&rev=177357&r1=177356&r2=177357
==============================================================================
--- branches/1.6.0/main/features.c (original)
+++ branches/1.6.0/main/features.c Thu Feb 19 09:57:16 2009
@@ -2276,7 +2276,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