From ba0095c5e2daee683ecb645e971e398f63da23f8 Mon Sep 17 00:00:00 2001
From: Yaroslav Brustinov <ybrustin@cisco.com>
Date: Fri, 28 Oct 2016 15:55:40 +0200
Subject: rebase merge typo

Signed-off-by: Yaroslav Brustinov <ybrustin@cisco.com>
---
 src/main_dpdk.cpp | 2 --
 1 file changed, 2 deletions(-)

(limited to 'src')

diff --git a/src/main_dpdk.cpp b/src/main_dpdk.cpp
index 995f6a4c..eb845803 100644
--- a/src/main_dpdk.cpp
+++ b/src/main_dpdk.cpp
@@ -76,10 +76,8 @@ extern "C" {
 #include "pre_test.h"
 #include "stateful_rx_core.h"
 #include "debug.h"
-<<<<<<< 653629bee578b4888bd0c144386c03a4b0d08eef
 #include "pkt_gen.h"
 #include "trex_port_attr.h"
->>>>>>> 73cffaf2cc2f21cb902dbd672e93577878c9f6b1
 #include "internal_api/trex_platform_api.h"
 #include "main_dpdk.h"
 #include "trex_watchdog.h"
-- 
cgit 1.2.3-korg