From d77607e3d26579ad3f34ac16fd4a99e88a6e7420 Mon Sep 17 00:00:00 2001 From: jpeeler Date: Thu, 19 Feb 2009 15:57:16 +0000 Subject: 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: http://svn.digium.com/svn/asterisk/branches/1.6.0@177357 f38db490-d61c-443f-a65b-d21fe96a405b --- main/features.c | 1 - 1 file changed, 1 deletion(-) (limited to 'main/features.c') diff --git a/main/features.c b/main/features.c index eb3ea3334..ffe06366b 100644 --- a/main/features.c +++ b/main/features.c @@ -2276,7 +2276,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 -- cgit v1.2.3