diff options
| author | Jeff Peeler <jpeeler@digium.com> | 2009-02-19 15:56:31 +0000 |
|---|---|---|
| committer | Jeff Peeler <jpeeler@digium.com> | 2009-02-19 15:56:31 +0000 |
| commit | 90a637487171dd3373c4cd1aa539ac7546b388e8 (patch) | |
| tree | bb73312ff4f48e72e4518a92dc0b41a8667763cd /main/features.c | |
| parent | a1f583177e3da754f9b9bdfb09219133f110de86 (diff) | |
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
Diffstat (limited to 'main/features.c')
| -rw-r--r-- | main/features.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/main/features.c b/main/features.c index 076988d28..405810115 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 |