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
17 years ago · 90a6374871
parent a1f583177e
commit 90a6374871
1 changed files with 0 additions and 1 deletions
--- 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