clear merging conflict

2025-08-25 10:11:20 +08:00
parent 11b630ffa2
commit 88e9ee97e9
112 changed files with 1711 additions and 6912 deletions
@@ -0,0 +1,18 @@
+.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
+/.vscode
+/StgSharpDebug/obj
+/StgSharpDebug/bin