clear merging conflict

StgSharpDebug/Control

@@ -0,0 +1 @@
+D:/NitloadIndustry/研究项目/1-Flagship/TH2020/ProjectFile/源代码/StgSharp/Control

StgSharpDebug/NativeMethods.txt

@@ -0,0 +1,43 @@
+WNDCLASSA
+AdjustWindowRect
+ChoosePixelFormat
+CreateWindowEx
+DefWindowProc
+DescribePixelFormat
+DestroyWindow
+DispatchMessage
+FreeLibrary
+GetDC
+GetEnhMetaFilePixelFormat
+GetModuleHandle
+GetPixelFormat
+GetProcAddress
+LoadCursor
+LoadLibrary
+PeekMessage
+PostQuitMessage
+RegisterClass
+RegisterClassA
+ReleaseDC
+SetPixelFormat
+ShowWindow
+SwapBuffers
+TranslateMessage
+UpdateWindow
+wglGetProcAddress
+wglCreateContext
+wglCreateLayerContext
+wglCopyContext
+wglDeleteContext
+wglDescribeLayerPlane
+wglGetCurrentContext
+wglGetCurrentDC
+wglGetLayerPaletteEntries
+wglGetProcAddress
+wglMakeCurrent
+wglRealizeLayerPalette
+wglSetLayerPaletteEntries
+wglShareLists
+wglSwapLayerBuffers
+wglUseFontBitmaps
+wglUseFontOutlines

StgSharpDebug/Program.cs

@@ -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
             {