merge beheben

This commit is contained in:
2025-11-26 09:06:37 +01:00
parent ee22f3c778
commit 8e9e964c02
2 changed files with 11 additions and 11 deletions

View File

@@ -93,7 +93,7 @@ Partial Class usrctlProcedures
Me.Button50 = New System.Windows.Forms.Button()
Me.Button49 = New System.Windows.Forms.Button()
Me.TabPage7 = New System.Windows.Forms.TabPage()
Me.Button53 = New System.Windows.Forms.Button()
Me.btnT1Data = New System.Windows.Forms.Button()
Me.Label22 = New System.Windows.Forms.Label()
Me.dtpbis = New System.Windows.Forms.DateTimePicker()
Me.lblDakosyImport = New System.Windows.Forms.Label()
@@ -164,7 +164,7 @@ Partial Class usrctlProcedures
Me.Column2 = New System.Windows.Forms.DataGridViewTextBoxColumn()
Me.Button54 = New System.Windows.Forms.Button()
Me.Label23 = New System.Windows.Forms.Label()
Me.TabControl1.SuspendLayout()
'Me.TabControl1.SuspendLayout()
Me.TabPage3.SuspendLayout()
Me.TabPage1.SuspendLayout()
CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -1502,7 +1502,7 @@ Partial Class usrctlProcedures
'
'TabPage9
'
Me.TabPage9.Controls.Add(Me.Button53)
Me.TabPage9.Controls.Add(Me.btnT1Data)
Me.TabPage9.Location = New System.Drawing.Point(4, 22)
Me.TabPage9.Name = "TabPage9"
Me.TabPage9.Padding = New System.Windows.Forms.Padding(3)
@@ -1513,12 +1513,12 @@ Partial Class usrctlProcedures
'
'Button53
'
Me.Button53.Location = New System.Drawing.Point(228, 120)
Me.Button53.Name = "Button53"
Me.Button53.Size = New System.Drawing.Size(145, 49)
Me.Button53.TabIndex = 25
Me.Button53.Text = "T1 Servcie"
Me.Button53.UseVisualStyleBackColor = True
Me.btnT1Data.Location = New System.Drawing.Point(228, 120)
Me.btnT1Data.Name = "btnT1Data"
Me.btnT1Data.Size = New System.Drawing.Size(145, 49)
Me.btnT1Data.TabIndex = 25
Me.btnT1Data.Text = "T1 Servcie"
Me.btnT1Data.UseVisualStyleBackColor = True
'
'usrctlProcedures
'
@@ -1736,7 +1736,7 @@ Partial Class usrctlProcedures
Friend WithEvents Button52 As Button
Friend WithEvents Label22 As Label
Friend WithEvents dtpbis As DateTimePicker
Friend WithEvents Button53 As Button
Friend WithEvents btnT1Data As Button
Friend WithEvents Label23 As Label
Friend WithEvents Button54 As Button
Friend WithEvents TabPage8 As TabPage