mergekonfl.

This commit is contained in:
2023-09-08 13:29:54 +02:00
parent 3698fa827b
commit 71e140a23f
13 changed files with 3079 additions and 502 deletions

View File

@@ -3,8 +3,9 @@
<MySubMain>true</MySubMain>
<MainForm>frmLogin</MainForm>
<SingleInstance>false</SingleInstance>
<ShutdownMode>0</ShutdownMode>
<ShutdownMode>1</ShutdownMode>
<EnableVisualStyles>true</EnableVisualStyles>
<AuthenticationMode>0</AuthenticationMode>
<SaveMySettingsOnExit>true</SaveMySettingsOnExit>
<HighDpiMpde>false</HighDpiMpde>
</MyApplicationData>