From e9dc4cb45dc29c16c2681f53d749d1c88176b69a Mon Sep 17 00:00:00 2001
From: wzp <2880584989@qq.com>
Date: 星期四, 16 九月 2021 15:59:33 +0800
Subject: [PATCH] Squashed commit of the following:

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

diff --git a/web/Dao/obj/Debug/Dao.csproj.CoreCompileInputs.cache b/web/Dao/obj/Debug/Dao.csproj.CoreCompileInputs.cache
index e3d8de7..ae28740 100644
--- a/web/Dao/obj/Debug/Dao.csproj.CoreCompileInputs.cache
+++ b/web/Dao/obj/Debug/Dao.csproj.CoreCompileInputs.cache
@@ -1 +1,5 @@
+<<<<<<< HEAD
 d5ec7438d89fe18e3bec35b6f500682586a1659d
+=======
+43d05d7d9c29e436978c39f631255cf56ad1e8a9
+>>>>>>> remotes/origin/Release

--
Gitblit v1.9.1