clear merging conflict

2025-08-25 10:17:25 +08:00
parent 88e9ee97e9 1fc687f7d0
commit fe097fd94c
1571 changed files with 629573 additions and 76392 deletions
@@ -45,7 +45,6 @@ using System.Diagnostics;
 using System.Runtime.CompilerServices;
 using System.Runtime.Intrinsics;
 using System.Runtime.Intrinsics.X86;
-using System.Threading;
 using System.Xml.XPath;

 namespace StgSharp
@@ -175,7 +174,13 @@ namespace StgSharp
            catch (Exception ex)
            {
                Console.WriteLine(ex);
+                /*
+                World.WriteLog($"{ex}", LogType.Error);
+                if( true ) { }
+                Dialogue.PostError( ex ); 
+                /**/
                World.Terminate(-1);
+                /**/
            }
            finally
            {