clear merging conflict

This commit is contained in:
Youmu Liu
2025-08-25 10:17:25 +08:00
1571 changed files with 629573 additions and 76392 deletions
+15 -12
View File
@@ -1,18 +1,21 @@
.vs
/StgSharp.Common/bin
/StgSharp.Common/obj
/TestResults
/STgSharpTest/bin
/STgSharpTest/obj
/StgSharp.Script/obj
/StgSharp.Script/bin
/StgSharp.TerminalDialogue/build
/StgSharp.TerminalDialogue/obj
/build
/StgSharp.Model/bin
/StgSharp.Model/obj
/.cr
/.idea
/.vs
/.vscode
/StgSharp.Common/obj
/StgSharp.Common/bin
/StgSharp.Model/obj
/StgSharp.Model/bin
/StgSharp.Script/obj
/StgSharp.Script/bin
/StgSharp.TerminalDialogue/obj
/StgSharp.TerminalDialogue/build
/StgSharpDebug/obj
/StgSharpDebug/bin
/STgSharpTest/obj
/STgSharpTest/bin
/TestResults
/StgSharp.Native/x64
/StgSharp.Native/x64