mergekonfl.
This commit is contained in:
2
Aviso/My Project/Application.Designer.vb
generated
2
Aviso/My Project/Application.Designer.vb
generated
@@ -27,7 +27,7 @@ Namespace My
|
||||
Me.IsSingleInstance = false
|
||||
Me.EnableVisualStyles = true
|
||||
Me.SaveMySettingsOnExit = true
|
||||
Me.ShutDownStyle = Global.Microsoft.VisualBasic.ApplicationServices.ShutdownMode.AfterMainFormCloses
|
||||
Me.ShutDownStyle = Global.Microsoft.VisualBasic.ApplicationServices.ShutdownMode.AfterAllFormsClose
|
||||
End Sub
|
||||
|
||||
<Global.System.Diagnostics.DebuggerStepThroughAttribute()> _
|
||||
|
||||
@@ -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>
|
||||
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
|
||||
' übernehmen, indem Sie "*" eingeben:
|
||||
' <Assembly: AssemblyVersion("1.0.*")>
|
||||
|
||||
<Assembly: AssemblyVersion("3.9.1.3")>
|
||||
<Assembly: AssemblyFileVersion("3.9.1.3")>
|
||||
<Assembly: AssemblyVersion("3.9.1.4")>
|
||||
<Assembly: AssemblyFileVersion("3.9.1.4")>
|
||||
|
||||
Reference in New Issue
Block a user