remove code inserted by incorrect merge resolve 77/5377/1
authorYaroslav Brustinov <[email protected]>
Thu, 2 Feb 2017 12:01:02 +0000 (14:01 +0200)
committerYaroslav Brustinov <[email protected]>
Thu, 2 Feb 2017 12:01:02 +0000 (14:01 +0200)
commit7c9861cd09fcbd4d0360acf9b64441c346c4ba12
tree7951fd266b75e46d3400842af45075387c5cbc50
parentae142588405743298d322310434ba28b9b8b8f74
remove code inserted by incorrect merge resolve

Change-Id: Ic2c4e8ce8cd5eed8bea230603838dd66f05ef4ea
Signed-off-by: Yaroslav Brustinov <[email protected]>
scripts/automation/trex_control_plane/stl/trex_stl_lib/trex_stl_client.py
src/stateless/cp/trex_stateless_port.h