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.pack.json | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 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.pack.json" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/staticwebassets.pack.json"
index 56590bc..bda92e8 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/staticwebassets.pack.json"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/staticwebassets.pack.json"
@@ -1,6 +1,7 @@
{
"Files": [
{
+<<<<<<< HEAD
"Id": "E:\\椤圭洰闆哱\SanYiWuHu\\ChuanSuoCheKu\\浠ｇ爜绠＄悊\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\wwwroot\\css\\style.css",
"PackagePath": "staticwebassets\\css\\style.css"
},
@@ -18,6 +19,25 @@
},
{
"Id": "E:\\椤圭洰闆哱\SanYiWuHu\\ChuanSuoCheKu\\浠ｇ爜绠＄悊\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\wwwroot\\swg-login.html",
+=======
+ "Id": "E:\\椤圭洰闆哱\ChuanSuoCheKu\\浠ｇ爜绠＄悊\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\wwwroot\\css\\style.css",
+ "PackagePath": "staticwebassets\\css\\style.css"
+ },
+ {
+ "Id": "E:\\椤圭洰闆哱\ChuanSuoCheKu\\浠ｇ爜绠＄悊\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\wwwroot\\favicon.ico",
+ "PackagePath": "staticwebassets\\favicon.ico"
+ },
+ {
+ "Id": "E:\\椤圭洰闆哱\ChuanSuoCheKu\\浠ｇ爜绠＄悊\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\wwwroot\\js\\anime.min.js",
+ "PackagePath": "staticwebassets\\js\\anime.min.js"
+ },
+ {
+ "Id": "E:\\椤圭洰闆哱\ChuanSuoCheKu\\浠ｇ爜绠＄悊\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\wwwroot\\logo.jpg.jpg",
+ "PackagePath": "staticwebassets\\logo.jpg.jpg"
+ },
+ {
+ "Id": "E:\\椤圭洰闆哱\ChuanSuoCheKu\\浠ｇ爜绠＄悊\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\wwwroot\\swg-login.html",
+>>>>>>> 5a35ada0577d0891fe9de3130334663303e79843
"PackagePath": "staticwebassets\\swg-login.html"
},
{
--
Gitblit v1.9.3