合并解决冲突

UTS_Core/obj/Debug/.NETFramework,Version=v4.8.AssemblyAttributes.vb

@@ -1,7 +0,0 @@
-' <autogenerated/>
-            Option Strict Off
-            Option Explicit On
-
-            Imports System
-            Imports System.Reflection
-            <Assembly: Global.System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.8", FrameworkDisplayName:=".NET Framework 4.8")>

UTS_Core/obj/Release/UTS_Core.vbproj.CoreCompileInputs.cache

@@ -1 +0,0 @@
-d8638d6595d09b0b903150cb6ae1118b6ae4dc44

UTS_Core/obj/Release/UTS_Core.vbproj.FileListAbsolute.txt

@@ -1,55 +0,0 @@
-E:\Sync\UTS\SW\UTS_Studio\UTS_Core\bin\Release\UTS_Core.dll.config
-E:\Sync\UTS\SW\UTS_Studio\UTS_Core\bin\Release\UTS_Core.dll
-E:\Sync\UTS\SW\UTS_Studio\UTS_Core\bin\Release\UTS_Core.pdb
-E:\Sync\UTS\SW\UTS_Studio\UTS_Core\bin\Release\UTS_Core.xml
-E:\Sync\UTS\SW\UTS_Studio\UTS_Core\bin\Release\BouncyCastle.Crypto.dll
-E:\Sync\UTS\SW\UTS_Studio\UTS_Core\bin\Release\FlexCell.dll
-E:\Sync\UTS\SW\UTS_Studio\UTS_Core\bin\Release\FluentFTP.dll
-E:\Sync\UTS\SW\UTS_Studio\UTS_Core\bin\Release\Google.Protobuf.dll
-E:\Sync\UTS\SW\UTS_Studio\UTS_Core\bin\Release\K4os.Compression.LZ4.dll
-E:\Sync\UTS\SW\UTS_Studio\UTS_Core\bin\Release\K4os.Compression.LZ4.Streams.dll
-E:\Sync\UTS\SW\UTS_Studio\UTS_Core\bin\Release\K4os.Hash.xxHash.dll
-E:\Sync\UTS\SW\UTS_Studio\UTS_Core\bin\Release\MySql.Data.dll
-E:\Sync\UTS\SW\UTS_Studio\UTS_Core\bin\Release\Newtonsoft.Json.dll
-E:\Sync\UTS\SW\UTS_Studio\UTS_Core\bin\Release\SharpCompress.dll
-E:\Sync\UTS\SW\UTS_Studio\UTS_Core\bin\Release\System.Buffers.dll
-E:\Sync\UTS\SW\UTS_Studio\UTS_Core\bin\Release\System.Data.SQLite.dll
-E:\Sync\UTS\SW\UTS_Studio\UTS_Core\bin\Release\System.Memory.dll
-E:\Sync\UTS\SW\UTS_Studio\UTS_Core\bin\Release\System.Numerics.Vectors.dll
-E:\Sync\UTS\SW\UTS_Studio\UTS_Core\bin\Release\System.Runtime.CompilerServices.Unsafe.dll
-E:\Sync\UTS\SW\UTS_Studio\UTS_Core\bin\Release\System.Text.Encoding.CodePages.dll
-E:\Sync\UTS\SW\UTS_Studio\UTS_Core\bin\Release\Ubiety.Dns.Core.dll
-E:\Sync\UTS\SW\UTS_Studio\UTS_Core\bin\Release\Zstandard.Net.dll
-E:\Sync\UTS\SW\UTS_Studio\UTS_Core\bin\Release\FluentFTP.xml
-E:\Sync\UTS\SW\UTS_Studio\UTS_Core\bin\Release\Google.Protobuf.pdb
-E:\Sync\UTS\SW\UTS_Studio\UTS_Core\bin\Release\Google.Protobuf.xml
-E:\Sync\UTS\SW\UTS_Studio\UTS_Core\bin\Release\K4os.Compression.LZ4.xml
-E:\Sync\UTS\SW\UTS_Studio\UTS_Core\bin\Release\K4os.Compression.LZ4.Streams.xml
-E:\Sync\UTS\SW\UTS_Studio\UTS_Core\bin\Release\K4os.Hash.xxHash.xml
-E:\Sync\UTS\SW\UTS_Studio\UTS_Core\bin\Release\MySql.Data.xml
-E:\Sync\UTS\SW\UTS_Studio\UTS_Core\bin\Release\Newtonsoft.Json.xml
-E:\Sync\UTS\SW\UTS_Studio\UTS_Core\bin\Release\System.Buffers.xml
-E:\Sync\UTS\SW\UTS_Studio\UTS_Core\bin\Release\System.Memory.xml
-E:\Sync\UTS\SW\UTS_Studio\UTS_Core\bin\Release\System.Numerics.Vectors.xml
-E:\Sync\UTS\SW\UTS_Studio\UTS_Core\bin\Release\System.Runtime.CompilerServices.Unsafe.xml
-E:\Sync\UTS\SW\UTS_Studio\UTS_Core\bin\Release\System.Text.Encoding.CodePages.xml
-E:\Sync\UTS\SW\UTS_Studio\UTS_Core\obj\Release\UTS_Core.Resources.resources
-E:\Sync\UTS\SW\UTS_Studio\UTS_Core\obj\Release\UTS_Core.UTSModule.Login.LoginForm.resources
-E:\Sync\UTS\SW\UTS_Studio\UTS_Core\obj\Release\UTS_Core.UTSModule.Project.DlgCreateProject.resources
-E:\Sync\UTS\SW\UTS_Studio\UTS_Core\obj\Release\UTS_Core.UTSModule.Project.DlgLoadProject.resources
-E:\Sync\UTS\SW\UTS_Studio\UTS_Core\obj\Release\UTS_Core.UTSModule.Project.FrmProject.resources
-E:\Sync\UTS\SW\UTS_Studio\UTS_Core\obj\Release\UTS_Core.UTSModule.Station.DlgLoadStation.resources
-E:\Sync\UTS\SW\UTS_Studio\UTS_Core\obj\Release\UTS_Core.UTSModule.Station.DlgStationPlanStyle.resources
-E:\Sync\UTS\SW\UTS_Studio\UTS_Core\obj\Release\UTS_Core.UTSModule.Station.FrmStationDesign.resources
-E:\Sync\UTS\SW\UTS_Studio\UTS_Core\obj\Release\UTS_Core.UTSModule.Station.FrmStationPlan.resources
-E:\Sync\UTS\SW\UTS_Studio\UTS_Core\obj\Release\UTS_Core.UTSModule.Test.Controls.UtsInputBox.resources
-E:\Sync\UTS\SW\UTS_Studio\UTS_Core\obj\Release\UTS_Core.UTSModule.Test.Controls.UtsMsgBox.resources
-E:\Sync\UTS\SW\UTS_Studio\UTS_Core\obj\Release\UTS_Core.UTSModule.Test.FrmStationTest.resources
-E:\Sync\UTS\SW\UTS_Studio\UTS_Core\obj\Release\UTS_Core.vbproj.GenerateResource.cache
-E:\Sync\UTS\SW\UTS_Studio\UTS_Core\obj\Release\UTS_Core.vbproj.CoreCompileInputs.cache
-E:\Sync\UTS\SW\UTS_Studio\UTS_Core\obj\Release\UTS_Core.vbproj.CopyComplete
-E:\Sync\UTS\SW\UTS_Studio\UTS_Core\obj\Release\UTS_Core.dll
-E:\Sync\UTS\SW\UTS_Studio\UTS_Core\obj\Release\UTS_Core.xml
-E:\Sync\UTS\SW\UTS_Studio\UTS_Core\obj\Release\UTS_Core.pdb
-E:\Sync\UTS\SW\UTS_Studio\UTS_Core\bin\Release\TeeChart.dll
-E:\Sync\UTS\SW\UTS_Studio\UTS_Core\obj\Release\UTS_Core.vbproj.AssemblyReference.cache