From 9f5df1b277c9f72f0aeb847de042de4934286f60 Mon Sep 17 00:00:00 2001
From: yzh <snbbt@21cn.com>
Date: 星期一, 14 三月 2022 11:57:12 +0800
Subject: [PATCH] Test

---
 web/Dao/obj/Release/Dao.csproj.CoreCompileInputs.cache |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/web/Dao/obj/Release/Dao.csproj.CoreCompileInputs.cache b/web/Dao/obj/Release/Dao.csproj.CoreCompileInputs.cache
index 3d2c5e5..21ddc74 100644
--- a/web/Dao/obj/Release/Dao.csproj.CoreCompileInputs.cache
+++ b/web/Dao/obj/Release/Dao.csproj.CoreCompileInputs.cache
@@ -1,5 +1,9 @@
+<<<<<<< HEAD
 <<<<<<< Updated upstream
 03ac8fb778df47064b4ab65f28af8408156b7fa4
 =======
 4e3d3c0d46e0394eded6a28ceeaec6a8f69625db
 >>>>>>> Stashed changes
+=======
+03ac8fb778df47064b4ab65f28af8408156b7fa4
+>>>>>>> 751731362e5fcf901065c25eaed0319cf7a27cc1

--
Gitblit v1.9.1