From 39368ecce1a87b67057d050ed913ab3ccb6bb3fd Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期一, 14 十月 2024 15:31:36 +0800
Subject: [PATCH] 1

---
 代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/staticwebassets.development.json |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/staticwebassets.development.json" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/staticwebassets.development.json"
index 38bf15d..7bb4839 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/staticwebassets.development.json"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/staticwebassets.development.json"
@@ -1 +1,5 @@
-{"ContentRoots":["E:\\椤圭洰闆哱\ChuanSuoCheKu\\浠ｇ爜绠＄悊\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\wwwroot\\"],"Root":{"Children":{"css":{"Children":{"style.css":{"Children":null,"Asset":{"ContentRootIndex":0,"SubPath":"css/style.css"},"Patterns":null}},"Asset":null,"Patterns":null},"favicon.ico":{"Children":null,"Asset":{"ContentRootIndex":0,"SubPath":"favicon.ico"},"Patterns":null},"js":{"Children":{"anime.min.js":{"Children":null,"Asset":{"ContentRootIndex":0,"SubPath":"js/anime.min.js"},"Patterns":null}},"Asset":null,"Patterns":null},"logo.jpg.jpg":{"Children":null,"Asset":{"ContentRootIndex":0,"SubPath":"logo.jpg.jpg"},"Patterns":null},"swg-login.html":{"Children":null,"Asset":{"ContentRootIndex":0,"SubPath":"swg-login.html"},"Patterns":null}},"Asset":null,"Patterns":[{"ContentRootIndex":0,"Pattern":"**","Depth":0}]}}
\ No newline at end of file
+<<<<<<< HEAD
+{"ContentRoots":["E:\\椤圭洰闆哱\SanYiWuHu\\ChuanSuoCheKu\\浠ｇ爜绠＄悊\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\wwwroot\\"],"Root":{"Children":{"css":{"Children":{"style.css":{"Children":null,"Asset":{"ContentRootIndex":0,"SubPath":"css/style.css"},"Patterns":null}},"Asset":null,"Patterns":null},"favicon.ico":{"Children":null,"Asset":{"ContentRootIndex":0,"SubPath":"favicon.ico"},"Patterns":null},"js":{"Children":{"anime.min.js":{"Children":null,"Asset":{"ContentRootIndex":0,"SubPath":"js/anime.min.js"},"Patterns":null}},"Asset":null,"Patterns":null},"logo.jpg.jpg":{"Children":null,"Asset":{"ContentRootIndex":0,"SubPath":"logo.jpg.jpg"},"Patterns":null},"swg-login.html":{"Children":null,"Asset":{"ContentRootIndex":0,"SubPath":"swg-login.html"},"Patterns":null}},"Asset":null,"Patterns":[{"ContentRootIndex":0,"Pattern":"**","Depth":0}]}}
+=======
+{"ContentRoots":["E:\\椤圭洰闆哱\ChuanSuoCheKu\\浠ｇ爜绠＄悊\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\wwwroot\\"],"Root":{"Children":{"css":{"Children":{"style.css":{"Children":null,"Asset":{"ContentRootIndex":0,"SubPath":"css/style.css"},"Patterns":null}},"Asset":null,"Patterns":null},"favicon.ico":{"Children":null,"Asset":{"ContentRootIndex":0,"SubPath":"favicon.ico"},"Patterns":null},"js":{"Children":{"anime.min.js":{"Children":null,"Asset":{"ContentRootIndex":0,"SubPath":"js/anime.min.js"},"Patterns":null}},"Asset":null,"Patterns":null},"logo.jpg.jpg":{"Children":null,"Asset":{"ContentRootIndex":0,"SubPath":"logo.jpg.jpg"},"Patterns":null},"swg-login.html":{"Children":null,"Asset":{"ContentRootIndex":0,"SubPath":"swg-login.html"},"Patterns":null}},"Asset":null,"Patterns":[{"ContentRootIndex":0,"Pattern":"**","Depth":0}]}}
+>>>>>>> 5a35ada0577d0891fe9de3130334663303e79843

--
Gitblit v1.9.3