aboutsummaryrefslogtreecommitdiffstats
path: root/configs
diff options
context:
space:
mode:
authortwilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b>2009-01-31 00:07:15 +0000
committertwilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b>2009-01-31 00:07:15 +0000
commitf396d4b1a2d3056aff27909d21f8e6c78e6dc01f (patch)
treee227bf912d4cb05856c1809a3d84b4409153b3ab /configs
parentbd33d14e7d23b1fc1fd717284671e3dd1c510c40 (diff)
Merged revisions 172581 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ........ r172581 | twilson | 2009-01-30 15:50:03 -0600 (Fri, 30 Jan 2009) | 2 lines Remove incorret line from sample config ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@172638 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'configs')
-rw-r--r--configs/features.conf.sample2
1 files changed, 0 insertions, 2 deletions
diff --git a/configs/features.conf.sample b/configs/features.conf.sample
index 3fd118322..3f5da100d 100644
--- a/configs/features.conf.sample
+++ b/configs/features.conf.sample
@@ -23,8 +23,6 @@ context => parkedcalls ; Which context parked calls are in (default parking lot
; one of: callee, caller, both, no (default is no)
;parkedcallreparking = caller ; Enables or disables DTMF based parking when picking up a parked call.
; one of: callee, caller, both, no (default is no)
-;parkedcallparking = caller ; Enables or disables DTMF based one-touch parking when picking up a parked call.
- ; one of: callee, caller, both, no (default is no)
;parkedcallhangup = caller ; Enables or disables DTMF based hangups when picking up a parked call.
; one of: callee, caller, both, no (default is no)
;parkedcallrecording = caller ; Enables or disables DTMF based one-touch recording when picking up a parked call.