diff options
| author | Stefan Schmidt <sst@sil.at> | 2011-09-07 14:47:03 +0000 |
|---|---|---|
| committer | Stefan Schmidt <sst@sil.at> | 2011-09-07 14:47:03 +0000 |
| commit | 40f505c00979f3a871a20f75ca9bb08ca10ab314 (patch) | |
| tree | 38af427e1d878d0178de404cbd875cf76ae0a511 /main | |
| parent | 334401e57d6cd9bbc3f7b6d98119defa8786a617 (diff) | |
clean up wrong merged stuff
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@334744 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
| -rw-r--r-- | main/features.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/main/features.c b/main/features.c index a683ffe9e..7afd71b4a 100644 --- a/main/features.c +++ b/main/features.c @@ -7063,12 +7063,6 @@ int ast_do_pickup(struct ast_channel *chan, struct ast_channel *target) ast_log(LOG_WARNING, "Unable to queue answer on '%s'\n", chan_name); goto pickup_failed; } - - /* setting this flag to generate a reason header in the cancel message to the ringing channel */ - ast_set_flag(chan, AST_FLAG_ANSWERED_ELSEWHERE); - - /* setting this flag to generate a reason header in the cancel message to the ringing channel */ - ast_set_flag(chan, AST_FLAG_ANSWERED_ELSEWHERE); if (ast_channel_masquerade(target, chan)) { ast_log(LOG_WARNING, "Unable to masquerade '%s' into '%s'\n", chan_name, |