From 8912e0696af069de47646fdb8a9d9c4e086e88b3 Mon Sep 17 00:00:00 2001
From: 游雁 <zhifu.gzf@alibaba-inc.com>
Date: 星期日, 14 一月 2024 23:42:11 +0800
Subject: [PATCH] Resolve merge conflict

---
 runtime/onnxruntime/third_party/glog/src/glog/export.h |    0 
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/runtime/onnxruntime/third_party/glog/src/glog/export.h.macos b/runtime/onnxruntime/third_party/glog/src/glog/export.h
similarity index 100%
rename from runtime/onnxruntime/third_party/glog/src/glog/export.h.macos
rename to runtime/onnxruntime/third_party/glog/src/glog/export.h

--
Gitblit v1.9.1