Павел Ладягин F1rsTTeaM
  • Joined on 2023-10-29
F1rsTTeaM created branch LabWork04.1 in F1rsTTeaM/PIbd-13_Ladyagin_P.D._Simple 2024-03-28 18:07:26 +04:00
F1rsTTeaM pushed to LabWork04.1 at F1rsTTeaM/PIbd-13_Ladyagin_P.D._Simple 2024-03-28 18:07:26 +04:00
7d44b74eba 4 лабораторная работа
F1rsTTeaM pushed to LabWork03.1 at F1rsTTeaM/PIbd-13_Ladyagin_P.D._Simple 2024-03-23 18:42:27 +04:00
a12a340c89 Готовая лаба
F1rsTTeaM created pull request F1rsTTeaM/PIbd-13_Ladyagin_P.D._Simple#5 2024-03-23 18:10:20 +04:00
WIP: Test
F1rsTTeaM pushed to LabWork03.1 at F1rsTTeaM/PIbd-13_Ladyagin_P.D._Simple 2024-03-23 18:09:24 +04:00
0a45e204e6 Добавлена папка коллекции
F1rsTTeaM created branch LabWork03.1 in F1rsTTeaM/PIbd-13_Ladyagin_P.D._Simple 2024-03-23 18:09:24 +04:00
F1rsTTeaM commented on pull request F1rsTTeaM/PIbd-13_Ladyagin_P.D._Simple#4 2024-03-23 16:03:38 +04:00
PIbd-13_Ladyagin_P.D. LabWork02 Simple

У меня не получилось решить конфликты в предыдущей ветке, я сделал идентичную, и тут все работает.

F1rsTTeaM pushed to LabWork02.1 at F1rsTTeaM/PIbd-13_Ladyagin_P.D._Simple 2024-03-23 15:58:06 +04:00
b039442fea Готовая лаба
F1rsTTeaM pushed to LabWork02.1 at F1rsTTeaM/PIbd-13_Ladyagin_P.D._Simple 2024-03-23 15:26:37 +04:00
ef5352ab0c Создание папки Drawnings
F1rsTTeaM pushed to LabWork02 at F1rsTTeaM/PIbd-13_Ladyagin_P.D._Simple 2024-03-23 15:18:04 +04:00
cf138734b7 Решение конфликта 5
F1rsTTeaM pushed to LabWork02 at F1rsTTeaM/PIbd-13_Ladyagin_P.D._Simple 2024-03-23 15:13:57 +04:00
dae9548900 Решение конфликта 4
F1rsTTeaM pushed to LabWork02.1 at F1rsTTeaM/PIbd-13_Ladyagin_P.D._Simple 2024-03-23 15:11:27 +04:00
a0f64e592f Создание папки Entities
F1rsTTeaM created pull request F1rsTTeaM/PIbd-13_Ladyagin_P.D._Simple#4 2024-03-23 14:58:57 +04:00
WIP: Test
F1rsTTeaM created branch LabWork02.1 in F1rsTTeaM/PIbd-13_Ladyagin_P.D._Simple 2024-03-23 14:57:18 +04:00
F1rsTTeaM pushed to LabWork02.1 at F1rsTTeaM/PIbd-13_Ladyagin_P.D._Simple 2024-03-23 14:57:18 +04:00
9f13fc6a95 Добавление стратегии
F1rsTTeaM pushed to LabWork03 at F1rsTTeaM/PIbd-13_Ladyagin_P.D._Simple 2024-03-23 13:25:49 +04:00
1b49c94f50 Merge branch 'LabWork02' into LabWork03
d3687dc750 Решение конфликта 3
6b13374b77 Решение конфликта 2
0cd856801f Решение конфликта 1
Compare 4 commits »
F1rsTTeaM pushed to LabWork02 at F1rsTTeaM/PIbd-13_Ladyagin_P.D._Simple 2024-03-23 12:54:02 +04:00
d3687dc750 Решение конфликта 3
F1rsTTeaM pushed to LabWork02 at F1rsTTeaM/PIbd-13_Ladyagin_P.D._Simple 2024-03-23 10:35:36 +04:00
6b13374b77 Решение конфликта 2
F1rsTTeaM pushed to LabWork02 at F1rsTTeaM/PIbd-13_Ladyagin_P.D._Simple 2024-03-23 10:29:08 +04:00
0cd856801f Решение конфликта 1
F1rsTTeaM pushed to LabWork03 at F1rsTTeaM/PIbd-13_Ladyagin_P.D._Simple 2024-03-20 16:01:44 +04:00
00492b0693 Исправлены требования оформления