From 20da247cb79c6972bed9984355dfc785d53baf6b Mon Sep 17 00:00:00 2001
From: wjm <wangjiming5@huawei.com>
Date: Tue, 9 Feb 2021 19:08:20 +0800
Subject: [PATCH] fix conflict

---
 ge/common/helper/model_helper.cc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ge/common/helper/model_helper.cc b/ge/common/helper/model_helper.cc
index dc68e38e..6bc7fefe 100644
--- a/ge/common/helper/model_helper.cc
+++ b/ge/common/helper/model_helper.cc
@@ -951,6 +951,7 @@ FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status ModelTool::GetModelInfoF
   return ret;
 }
 
+
 FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY Status ModelTool::GetModelInfoFromPbtxt(const char *model_file,
   ge::proto::ModelDef &model_def) {
   GE_CHECK_NOTNULL(model_file);