фиксим конфликты

This commit is contained in:
Иван Алексеев 2024-05-25 18:37:03 +04:00
parent f5a68a2844
commit c0823ac392

View File

@ -139,10 +139,9 @@
//
// buttonTakeOrderInWork
//
buttonTakeOrderInWork.Location = new Point(1085, 142);
buttonTakeOrderInWork.Margin = new Padding(3, 4, 3, 4);
buttonTakeOrderInWork.Location = new Point(806, 112);
buttonTakeOrderInWork.Name = "buttonTakeOrderInWork";
buttonTakeOrderInWork.Size = new Size(210, 35);
buttonTakeOrderInWork.Size = new Size(184, 26);
buttonTakeOrderInWork.TabIndex = 3;
buttonTakeOrderInWork.Text = "Отдать на выполнение";
buttonTakeOrderInWork.UseVisualStyleBackColor = true;
@ -150,10 +149,9 @@
//
// buttonOrderReady
//
buttonOrderReady.Location = new Point(1085, 218);
buttonOrderReady.Margin = new Padding(3, 4, 3, 4);
buttonOrderReady.Location = new Point(806, 169);
buttonOrderReady.Name = "buttonOrderReady";
buttonOrderReady.Size = new Size(208, 37);
buttonOrderReady.Size = new Size(182, 28);
buttonOrderReady.TabIndex = 4;
buttonOrderReady.Text = "Заказ готов";
buttonOrderReady.UseVisualStyleBackColor = true;