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.build.json | 43 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 43 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.build.json" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/staticwebassets.build.json"
index 9348bb9..d2cde2d 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/staticwebassets.build.json"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/staticwebassets.build.json"
@@ -1,6 +1,10 @@
{
"Version": 1,
+<<<<<<< HEAD
"Hash": "KywYYV+qnbKmg+roTXXghKf35LFqigGGAHUqA/shU10=",
+=======
+ "Hash": "U0AJ2WC57jzR84vGY0ZpDmmcRC95tocvDGZIzAf1O5w=",
+>>>>>>> 5a35ada0577d0891fe9de3130334663303e79843
"Source": "WIDESEAWCS_Server",
"BasePath": "_content/WIDESEAWCS_Server",
"Mode": "Default",
@@ -10,17 +14,28 @@
{
"Name": "WIDESEAWCS_Server\\wwwroot",
"Source": "WIDESEAWCS_Server",
+<<<<<<< HEAD
"ContentRoot": "E:\\椤圭洰闆哱\SanYiWuHu\\ChuanSuoCheKu\\浠ｇ爜绠＄悊\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\wwwroot\\",
+=======
+ "ContentRoot": "E:\\椤圭洰闆哱\ChuanSuoCheKu\\浠ｇ爜绠＄悊\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\wwwroot\\",
+>>>>>>> 5a35ada0577d0891fe9de3130334663303e79843
"BasePath": "_content/WIDESEAWCS_Server",
"Pattern": "**"
}
],
"Assets": [
{
+<<<<<<< HEAD
"Identity": "E:\\椤圭洰闆哱\SanYiWuHu\\ChuanSuoCheKu\\浠ｇ爜绠＄悊\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\wwwroot\\css\\style.css",
"SourceId": "WIDESEAWCS_Server",
"SourceType": "Discovered",
"ContentRoot": "E:\\椤圭洰闆哱\SanYiWuHu\\ChuanSuoCheKu\\浠ｇ爜绠＄悊\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\wwwroot\\",
+=======
+ "Identity": "E:\\椤圭洰闆哱\ChuanSuoCheKu\\浠ｇ爜绠＄悊\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\wwwroot\\css\\style.css",
+ "SourceId": "WIDESEAWCS_Server",
+ "SourceType": "Discovered",
+ "ContentRoot": "E:\\椤圭洰闆哱\ChuanSuoCheKu\\浠ｇ爜绠＄悊\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\wwwroot\\",
+>>>>>>> 5a35ada0577d0891fe9de3130334663303e79843
"BasePath": "_content/WIDESEAWCS_Server",
"RelativePath": "css/style.css",
"AssetKind": "All",
@@ -36,10 +51,17 @@
"OriginalItemSpec": "wwwroot\\css\\style.css"
},
{
+<<<<<<< HEAD
"Identity": "E:\\椤圭洰闆哱\SanYiWuHu\\ChuanSuoCheKu\\浠ｇ爜绠＄悊\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\wwwroot\\favicon.ico",
"SourceId": "WIDESEAWCS_Server",
"SourceType": "Discovered",
"ContentRoot": "E:\\椤圭洰闆哱\SanYiWuHu\\ChuanSuoCheKu\\浠ｇ爜绠＄悊\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\wwwroot\\",
+=======
+ "Identity": "E:\\椤圭洰闆哱\ChuanSuoCheKu\\浠ｇ爜绠＄悊\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\wwwroot\\favicon.ico",
+ "SourceId": "WIDESEAWCS_Server",
+ "SourceType": "Discovered",
+ "ContentRoot": "E:\\椤圭洰闆哱\ChuanSuoCheKu\\浠ｇ爜绠＄悊\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\wwwroot\\",
+>>>>>>> 5a35ada0577d0891fe9de3130334663303e79843
"BasePath": "_content/WIDESEAWCS_Server",
"RelativePath": "favicon.ico",
"AssetKind": "All",
@@ -55,10 +77,17 @@
"OriginalItemSpec": "wwwroot\\favicon.ico"
},
{
+<<<<<<< HEAD
"Identity": "E:\\椤圭洰闆哱\SanYiWuHu\\ChuanSuoCheKu\\浠ｇ爜绠＄悊\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\wwwroot\\js\\anime.min.js",
"SourceId": "WIDESEAWCS_Server",
"SourceType": "Discovered",
"ContentRoot": "E:\\椤圭洰闆哱\SanYiWuHu\\ChuanSuoCheKu\\浠ｇ爜绠＄悊\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\wwwroot\\",
+=======
+ "Identity": "E:\\椤圭洰闆哱\ChuanSuoCheKu\\浠ｇ爜绠＄悊\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\wwwroot\\js\\anime.min.js",
+ "SourceId": "WIDESEAWCS_Server",
+ "SourceType": "Discovered",
+ "ContentRoot": "E:\\椤圭洰闆哱\ChuanSuoCheKu\\浠ｇ爜绠＄悊\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\wwwroot\\",
+>>>>>>> 5a35ada0577d0891fe9de3130334663303e79843
"BasePath": "_content/WIDESEAWCS_Server",
"RelativePath": "js/anime.min.js",
"AssetKind": "All",
@@ -74,10 +103,17 @@
"OriginalItemSpec": "wwwroot\\js\\anime.min.js"
},
{
+<<<<<<< HEAD
"Identity": "E:\\椤圭洰闆哱\SanYiWuHu\\ChuanSuoCheKu\\浠ｇ爜绠＄悊\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\wwwroot\\logo.jpg.jpg",
"SourceId": "WIDESEAWCS_Server",
"SourceType": "Discovered",
"ContentRoot": "E:\\椤圭洰闆哱\SanYiWuHu\\ChuanSuoCheKu\\浠ｇ爜绠＄悊\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\wwwroot\\",
+=======
+ "Identity": "E:\\椤圭洰闆哱\ChuanSuoCheKu\\浠ｇ爜绠＄悊\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\wwwroot\\logo.jpg.jpg",
+ "SourceId": "WIDESEAWCS_Server",
+ "SourceType": "Discovered",
+ "ContentRoot": "E:\\椤圭洰闆哱\ChuanSuoCheKu\\浠ｇ爜绠＄悊\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\wwwroot\\",
+>>>>>>> 5a35ada0577d0891fe9de3130334663303e79843
"BasePath": "_content/WIDESEAWCS_Server",
"RelativePath": "logo.jpg.jpg",
"AssetKind": "All",
@@ -93,10 +129,17 @@
"OriginalItemSpec": "wwwroot\\logo.jpg.jpg"
},
{
+<<<<<<< HEAD
"Identity": "E:\\椤圭洰闆哱\SanYiWuHu\\ChuanSuoCheKu\\浠ｇ爜绠＄悊\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\wwwroot\\swg-login.html",
"SourceId": "WIDESEAWCS_Server",
"SourceType": "Discovered",
"ContentRoot": "E:\\椤圭洰闆哱\SanYiWuHu\\ChuanSuoCheKu\\浠ｇ爜绠＄悊\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\wwwroot\\",
+=======
+ "Identity": "E:\\椤圭洰闆哱\ChuanSuoCheKu\\浠ｇ爜绠＄悊\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\wwwroot\\swg-login.html",
+ "SourceId": "WIDESEAWCS_Server",
+ "SourceType": "Discovered",
+ "ContentRoot": "E:\\椤圭洰闆哱\ChuanSuoCheKu\\浠ｇ爜绠＄悊\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\wwwroot\\",
+>>>>>>> 5a35ada0577d0891fe9de3130334663303e79843
"BasePath": "_content/WIDESEAWCS_Server",
"RelativePath": "swg-login.html",
"AssetKind": "All",
--
Gitblit v1.9.3