From 9ead8af725d7040651b84619a388c07b28d0ce1c Mon Sep 17 00:00:00 2001
From: Wang <wayao@9801a7a9c287.ant.amazon.com>
Date: Tue, 15 Jan 2019 10:10:20 -0800
Subject: [PATCH] Fix tutorial

---
 tutorials/nnvm/deploy_ssd.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/tutorials/nnvm/deploy_ssd.py b/tutorials/nnvm/deploy_ssd.py
index 710748c1ddf3d..a9a279f672a0f 100644
--- a/tutorials/nnvm/deploy_ssd.py
+++ b/tutorials/nnvm/deploy_ssd.py
@@ -4,12 +4,7 @@
 **Author**: `Yao Wang <https://github.com/kevinthesun>`_
 
 This article is an introductory tutorial to deploy SSD models with TVM.
-<<<<<<< HEAD
-We will use mxnet pretrained SSD model with Resnet50 as body network and
-convert it to NNVM graph;
-=======
 We will use GluonCV pre-trained SSD model and convert it to NNVM graph.
->>>>>>> Modify SSD tutorial
 """
 import tvm