[svn-commits] branch kpfleming/trunk-test-for-merging - r8132 /team/kpfleming/trunk-test-fo...

[svn-commits at lists.digium.com]

Author: kpfleming
Date: Tue Jan 17 11:54:47 2006
New Revision: 8132

URL: http://svn.digium.com/view/asterisk?rev=8132&view=rev
Log:
create merge conflict for testing

Modified:
    team/kpfleming/trunk-test-for-merging/cli.c

Modified: team/kpfleming/trunk-test-for-merging/cli.c
URL: http://svn.digium.com/view/asterisk/team/kpfleming/trunk-test-for-merging/cli.c?rev=8132&r1=8131&r2=8132&view=diff
==============================================================================
--- team/kpfleming/trunk-test-for-merging/cli.c (original)
+++ team/kpfleming/trunk-test-for-merging/cli.c Tue Jan 17 11:54:47 2006
@@ -959,7 +959,7 @@
 	{ { "debug", "channel", NULL }, handle_debugchan, "Enable debugging on a channel", debugchan_help, complete_ch_3 },
 	{ { "debug", "level", NULL }, handle_debuglevel, "Set global debug level", debuglevel_help },
 	{ { "group", "show", "channels", NULL }, group_show_channels, "Show active channels with group(s)", group_show_channels_help},
-	{ { "help", NULL }, handle_help, "Display help list, or specific help on a command", help_help },
+	{ { "help", NULL }, handle_help, "Display help list, or specific help on a command", help_help2 },
 	{ { "load", NULL }, handle_load, "Load a dynamic module by name", load_help, complete_fn },
 	{ { "no", "debug", "channel", NULL }, handle_nodebugchan, "Disable debugging on a channel", nodebugchan_help, complete_ch_4 },
 	{ { "reload", NULL }, handle_reload, "Reload configuration", reload_help, complete_mod_2 },