From 461634382f528834457a41426116be38c7ae079e Mon Sep 17 00:00:00 2001
From: zhaozhixuan <zhaozhixuan2@hisilicon.com>
Date: Tue, 13 Apr 2021 11:48:55 +0800
Subject: [PATCH] fix bug.

---
 ge/model/ge_root_model.h | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/ge/model/ge_root_model.h b/ge/model/ge_root_model.h
index bd14effe..e838b19b 100755
--- a/ge/model/ge_root_model.h
+++ b/ge/model/ge_root_model.h
@@ -62,14 +62,11 @@ class GeRootModel {
   ComputeGraphPtr root_graph_ = nullptr;
   std::map<std::string, GeModelPtr> subgraph_instance_name_to_model_;
   uint32_t model_id_ = 0;
-<<<<<<< HEAD
   bool is_specific_stream_ = false;
-=======
   // In multithread online secenario, same graph can owns different davinci_model for for concurrency
   std::vector<uint32_t> model_ids_;
   bool train_flag_ = false;
   std::string model_name_;
->>>>>>> master
 };
 }  // namespace ge
 using GeRootModelPtr = std::shared_ptr<ge::GeRootModel>;