From 751731362e5fcf901065c25eaed0319cf7a27cc1 Mon Sep 17 00:00:00 2001
From: wangsheng <123456>
Date: 星期三, 01 十二月 2021 13:59:30 +0800
Subject: [PATCH] 掌骏云代理商权限无法正常使用修复

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

diff --git a/web/Model/obj/Debug/Model.csproj.CoreCompileInputs.cache b/web/Model/obj/Debug/Model.csproj.CoreCompileInputs.cache
index c7c818b..93b5477 100644
--- a/web/Model/obj/Debug/Model.csproj.CoreCompileInputs.cache
+++ b/web/Model/obj/Debug/Model.csproj.CoreCompileInputs.cache
@@ -1,5 +1 @@
-<<<<<<< HEAD
-d136e7243de12f847333601a3e3b0ceb3bb3ede8
-=======
-6af597a13fdb848e58fc339638f9e6f7dfd89007
->>>>>>> remotes/origin/Release
+39dc77968f868863dd739e41a7700ce06bba8c93

--
Gitblit v1.9.1