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/symbolize.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/runtime/onnxruntime/third_party/glog/src/symbolize.h b/runtime/onnxruntime/third_party/glog/src/symbolize.h
index 89a6a4f..86c22e3 100644
--- a/runtime/onnxruntime/third_party/glog/src/symbolize.h
+++ b/runtime/onnxruntime/third_party/glog/src/symbolize.h
@@ -54,9 +54,9 @@
 #ifndef BASE_SYMBOLIZE_H_
 #define BASE_SYMBOLIZE_H_
 
-#include "config.h"
-#include "glog/logging.h"
 #include "utilities.h"
+#include "config.h"
+#include <glog/logging.h>
 
 #ifdef HAVE_SYMBOLIZE
 

--
Gitblit v1.9.1