solving conflicts

2 files changed, 3 insertions, 3 deletions

diff --git a/scripts/automation/trex_control_plane/client/trex_adv_client.py b/scripts/automation/trex_control_plane/client/trex_adv_client.py
index b135da59..b3fe3dad 100755
--- a/scripts/automation/trex_control_plane/client/trex_adv_client.py
+++ b/scripts/automation/trex_control_plane/client/trex_adv_client.py
@@ -8,7 +8,7 @@ class CTRexAdvClient(trex_client.CTRexClient):
         super(CTRexAdvClient, self).__init__(trex_host, max_history_size, trex_daemon_port, trex_zmq_port, verbose)
         pass
 
-    # TREX KIWI advanced methods
+    # T-REX KIWI advanced methods
     def start_quick_trex(self, pcap_file, d, delay, dual, ipv6, times, interfaces):
         try:
             return self.server.start_quick_trex(pcap_file = pcap_file, duration = d, dual = dual, delay = delay, ipv6 = ipv6, times = times, interfaces = interfaces)
diff --git a/scripts/automation/trex_control_plane/client/trex_client.py b/scripts/automation/trex_control_plane/client/trex_client.py
index 607251fe..c3677132 100755
--- a/scripts/automation/trex_control_plane/client/trex_client.py
+++ b/scripts/automation/trex_control_plane/client/trex_client.py
@@ -805,7 +805,7 @@ class CTRexResult(object):
 
     def is_valid_hist (self):
         """
-        Checks if result object contains valid data.
+        Checks if result obejct contains valid data.
 
         :parameters:        
             None
@@ -819,7 +819,7 @@ class CTRexResult(object):
 
     def set_valid_hist (self, valid_stat = True):
         """
-        Sets result object validity status.
+        Sets result obejct validity status.
 
         :parameters:        
             valid_stat : bool