IvanAlekseev1/PIbd-21_Alekseev_I.S._Confectionery
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: IvanAlekseev1:8c1d74e12e7878981265be6c0b3cf613e11cf026
Branches Tags
IvanAlekseev1:main
IvanAlekseev1:Lab6
IvanAlekseev1:Lab1_Hard
IvanAlekseev1:Lab8
IvanAlekseev1:Lab7
IvanAlekseev1:Lab5
IvanAlekseev1:Lab4
IvanAlekseev1:Lab3
IvanAlekseev1:Lab2
IvanAlekseev1:Lab1
..
compare: IvanAlekseev1:c0823ac392d3fb58af9f3d56428b3a395dd25695
Branches Tags
IvanAlekseev1:Lab6
IvanAlekseev1:Lab1_Hard
IvanAlekseev1:Lab8
IvanAlekseev1:Lab7
IvanAlekseev1:Lab5
IvanAlekseev1:Lab4
IvanAlekseev1:Lab3
IvanAlekseev1:Lab2
IvanAlekseev1:Lab1
IvanAlekseev1:main

3 Commits
8c1d74e12e ... c0823ac392

Author SHA1 Message Date
Иван Алексеев
c0823ac392 фиксим конфликты 2024-05-25 18:37:03 +04:00
Иван Алексеев
f5a68a2844 Revert "конфликты фиксим" 
This reverts commit 839c3dd375.
 2024-05-25 18:24:00 +04:00
Иван Алексеев
839c3dd375 конфликты фиксим 2024-05-19 00:26:03 +04:00
1 changed files with 4 additions and 6 deletions
Show Stats Expand all files Collapse all files

10
Confectionery/ConfectioneryView/FormMain.Designer.cs generated
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;