解决冲突

2021-05-27 17:04:35 +08:00 · 2021-05-27 17:04:35 +08:00 · 8ea5ba3123
parent 5e1fcb69b7 063070bcb9
commit 8ea5ba3123
4 changed files with 1 additions and 1050 deletions
--- a/.gitignore
+++ b/.gitignore
@ -24,3 +24,4 @@
 /Waste.Socket/obj
 /Waste.Web.Entry/bin
 /Waste.Web.Entry/obj
 /.vs
--- a/.vs/Waste/DesignTimeBuild/.dtbcache.v2
+++ b/.vs/Waste/DesignTimeBuild/.dtbcache.v2
--- a/.vs/Waste/config/applicationhost.config
+++ b/.vs/Waste/config/applicationhost.config
--- a/.vs/Waste/v16/.suo
+++ b/.vs/Waste/v16/.suo