устранен конфликт
This commit is contained in:
commit
b798c28327
1
Confectionery/FormCreateOrder.Designer.cs
generated
1
Confectionery/FormCreateOrder.Designer.cs
generated
@ -127,7 +127,6 @@
|
||||
this.Controls.Add(this.label1);
|
||||
this.Name = "FormCreateOrder";
|
||||
this.Text = "Создание заказа";
|
||||
this.Load += new System.EventHandler(this.FormCreateOrder_Load);
|
||||
((System.ComponentModel.ISupportInitialize)(this.textBoxCount)).EndInit();
|
||||
this.ResumeLayout(false);
|
||||
this.PerformLayout();
|
||||
|
Loading…
Reference in New Issue
Block a user