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

Olle E. Johansson oej at edvina.net
Fri May 6 12:52:47 CDT 2011


There are two files in trunk/doc that have merge conflicts that are committed...

Have a nice weekend!

/O


More information about the asterisk-dev mailing list