diff options
| author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-02-19 15:57:16 +0000 |
|---|---|---|
| committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-02-19 15:57:16 +0000 |
| commit | d77607e3d26579ad3f34ac16fd4a99e88a6e7420 (patch) | |
| tree | fff4f8972b6e4cf1a65e197e72f898bf4f7b504c /main/features.c | |
| parent | e33fec2e146732b934af76a7a64204e731c7f046 (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.0@177357 f38db490-d61c-443f-a65b-d21fe96a405b
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 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 |