From: Jeff Peeler <jpeeler@digium.com>
Date: Thu, 19 Feb 2009 15:56:31 +0000 (+0000)
Subject: Fix mismerge from revision 176708 pointed out by Kaloyan Kovachev on the
X-Git-Tag: 1.6.2.0-beta1~170
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=90a637487171dd3373c4cd1aa539ac7546b388e8;p=thirdparty%2Fasterisk.git

Fix mismerge from revision 176708 pointed out by Kaloyan Kovachev on the
asterisk-dev mailing list. Thanks!



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@177356 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/features.c b/main/features.c
index 076988d28d..405810115a 100644
--- a/main/features.c
+++ b/main/features.c
@@ -2542,7 +2542,6 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast
 				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