fix conflict

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);