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

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

Previous message: [asterisk-dev] [Code Review] Split user options from extension in chan_sip.
Next message: [asterisk-dev] Merge conflicts in doc/asterisk.8
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

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

Have a nice weekend!

/O

Previous message: [asterisk-dev] [Code Review] Split user options from extension in chan_sip.
Next message: [asterisk-dev] Merge conflicts in doc/asterisk.8
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

More information about the asterisk-dev mailing list