fix conflict

This commit is contained in:
Mathieu Rene committed 2012-06-21 10:40:57 -04:00
commit 294ab3880f
9 files changed
+343 -149

No files matched your search

+2 -1
View File
@@ -5069,7 +5069,8 @@ static ftdm_cli_entry_t ftdm_cli_options[] =
/* Fake handlers as they are handled within freetdm library,
* we should provide a way inside freetdm to query for completions from signaling modules */
{ "core state", "[!]<state_name>", "", NULL },
{ "core flag", "[!]<flag_value>", "", NULL },
{ "core flag", "[!]<flag-int-value|flag-name> [<span_id|span_name>] [<chan_id>]", "", NULL },
{ "core spanflag", "[!]<flag-int-value|flag-name> [<span_id|span_name>]", "", NULL },
{ "core calls", "", "", NULL },
};