[asterisk-dev] [svn-commits] lathama: trunk r305650 - /trunk/configs/sip.conf.sample

[Paul Belanger]

On 11-02-01 04:16 PM, SVN commits to the Digium repositories wrote:
> Author: lathama
> Date: Tue Feb  1 15:16:31 2011
> New Revision: 305650
> 
Looks like a merging issue, the last few commits haven't been updating
the Binary property 'branch-1.8-merged' properly.

For example:

$ cd ~/digium/asterisk/commits/trunk
$ merge8trunk 305649
$ svn resolved . (if required)
$ svn commit -F ../merge.msg

-- 
Paul Belanger
Digium, Inc. | Software Developer
twitter: pabelanger | IRC: pabelanger (Freenode)
Check us out at: http://digium.com & http://asterisk.org