diff options
| author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-02-19 15:57:44 +0000 |
|---|---|---|
| committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-02-19 15:57:44 +0000 |
| commit | 64994e562d1d8ac0976049fc25f8b6a21f5ad06f (patch) | |
| tree | 0f78197e4c4d6430bac1654a855a0ad9cc0d1a80 /main | |
| parent | 2f0bf399301cccaec1dc467bcda5555854cf9a0a (diff) | |
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.1@177358 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -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 ac102a78b..aa61c0fdd 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 |