From 7bd27b4c5967ffaa87e8a813687da7edb909148c Mon Sep 17 00:00:00 2001
From: wangsheng <123456>
Date: 星期二, 22 三月 2022 10:25:42 +0800
Subject: [PATCH] 1

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

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

--
Gitblit v1.9.1