Viltskaa a1fd4cff58 Merge branch 'LabWork_6' into LabWork_6_hard
# Conflicts:
#	SushiBar/SushiBar/FormMain.Designer.cs
#	SushiBar/SushiBar/FormMain.cs
#	SushiBar/SushiBarBusinessLogic/BusinessLogics/OrderLogic.cs
#	SushiBar/SushiBarDatabaseImplement/SushiBarDatabase.cs
#	SushiBar/SushiBarFileImplement/DataFileSingleton.cs
#	SushiBar/SushibarListImplement/DataListSingleton.cs
2023-05-04 16:55:53 +04:00
..