clean up wrong merged stuff

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@334744 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/features.c b/main/features.c
index a683ffe9e54002f2eb6f039c7a4eac6939f58baf..7afd71b4aa88b277a5c4fbbf33201deba9debda1 100644 (file)
--- 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,