diff options
| author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-02-19 15:56:31 +0000 |
|---|---|---|
| committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-02-19 15:56:31 +0000 |
| commit | 375af5f7beb4fcf249b16200192b2533af60b994 (patch) | |
| tree | bb73312ff4f48e72e4518a92dc0b41a8667763cd | |
| parent | 48707e53d9739d1d361914b72a9d65faefe58860 (diff) | |
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/trunk@177356 f38db490-d61c-443f-a65b-d21fe96a405b
| -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 |