From 1a446ca1000492260b6401a952627223deef20cc Mon Sep 17 00:00:00 2001 From: Jeff Peeler Date: Thu, 19 Feb 2009 15:57:44 +0000 Subject: [PATCH] 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! ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@177358 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/features.c | 1 - 1 file changed, 1 deletion(-) diff --git a/main/features.c b/main/features.c index ac102a78b4..aa61c0fdd1 100644 --- a/main/features.c +++ b/main/features.c @@ -2473,7 +2473,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 -- 2.47.2