diff options
| author | Mark Michelson <mmichelson@digium.com> | 2012-12-13 16:39:40 +0000 |
|---|---|---|
| committer | Mark Michelson <mmichelson@digium.com> | 2012-12-13 16:39:40 +0000 |
| commit | ece4c957988c3926f679f805294072c31de59bda (patch) | |
| tree | 18addab5cab2b5c8c7b1f120bf78c7114735ea63 /configs | |
| parent | 7b5f4748fb368d81d588ae61a54d7a37c2f906ee (diff) | |
Resolve conflict and reset automerge.
git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@377980 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/sip.conf.sample | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/configs/sip.conf.sample b/configs/sip.conf.sample index bbd2af8df..90b8abe5f 100644 --- a/configs/sip.conf.sample +++ b/configs/sip.conf.sample @@ -1259,6 +1259,8 @@ srvlookup=yes ; Enable DNS SRV lookups on outbound calls ; dtlscafile ; dtlscapath ; dtlssetup +; ignore_requested_pref ; Ignore the requested codec and determine the preferred codec +; ; from the peer's configuration. ; ;------------------------------------------------------------------------------ |