[asterisk-dev] Merge conflicts in doc/asterisk.8

[Russell Bryant]

----- Original Message -----
> There are two files in trunk/doc that have merge conflicts that are
> committed...

... and which ones are they?  You have commit access.  Feel free to fix them.  :-)

-- 
Russell Bryant
Digium, Inc.   |   Engineering Manager, Open Source Software
445 Jan Davis Drive NW    -     Huntsville, AL 35806  -  USA
www.digium.com  -=-  www.asterisk.org -=- blogs.asterisk.org