From bd640666c052a1c770c9c1758c809f68d99af010 Mon Sep 17 00:00:00 2001 From: Dan Klein Date: Mon, 12 Oct 2015 09:11:44 +0300 Subject: solving conflicts --- .../trex_control_plane/examples/client_interactive_example.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts/automation/trex_control_plane/examples/client_interactive_example.py') diff --git a/scripts/automation/trex_control_plane/examples/client_interactive_example.py b/scripts/automation/trex_control_plane/examples/client_interactive_example.py index 5a3ebf8a..9ee28898 100755 --- a/scripts/automation/trex_control_plane/examples/client_interactive_example.py +++ b/scripts/automation/trex_control_plane/examples/client_interactive_example.py @@ -74,7 +74,7 @@ class InteractiveTRexClient(cmd.Cmd): print termstyle.green("*** End of TRex status prompt ***") def do_show_trex_files_path (self, line): - """Prompts the local path in which files are stored when pushed to TRex server from client""" + """Prompts the local path in which files are stored when pushed to t-rex server from client""" print self.trex.get_trex_files_path() print termstyle.green("*** End of trex_files_path prompt ***") -- cgit 1.2.3-korg