1
2
3
4
5
| <<<<<<< 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
|
|
