fix

ge/graph/load/graph_loader.cc

@@ -123,7 +123,6 @@ Status GraphLoader::GetMaxUsedMemory(uint32_t model_id, uint64_t &max_size) {
   return SUCCESS;
 }
 
-<<<<<<< Updated upstream
 Status GraphLoader::LoadDataFromFile(const std::string &path, int32_t priority, ModelData &model_data) {
   if (!CheckInputPathValid(path, "model_file")) {
     GELOGE(ACL_ERROR_GE_EXEC_MODEL_PATH_INVALID, "[Check][Param] model path is invalid:%s", path.c_str());