Alexey/DAS_2024_1
2
7
Fork 2
Code Issues Pull Requests 10 Actions Packages Projects Releases Wiki Activity

dozorova_alena_lab_6 #76

Merged
Alexey merged 6 commits from dozorova_alena_lab_6 into main 2024-10-26 11:27:22 +04:00
Conversation 2 Commits 6 Files Changed 9 +12
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a54e13f7ee - Show all commits

12
dozorova_alena_lab_6/.gitignore vendored Normal file
View File

@ -0,0 +1,12 @@
/dozorova_alena_lab_2/.vs
/dozorova_alena_lab_2/ConsoleApp1/.vs
/dozorova_alena_lab_2/ConsoleApp1/bin
/dozorova_alena_lab_2/ConsoleApp1/obj
/dozorova_alena_lab_2/ConsoleApp1/Properties/PublishProfiles
/dozorova_alena_lab_2/ConsoleApp2/.vs
/dozorova_alena_lab_2/ConsoleApp2/bin
/dozorova_alena_lab_2/ConsoleApp2/obj
/dozorova_alena_lab_6/ConsoleApp1/.vs
Alexey commented 2024-10-19 13:17:56 +04:00
Review
Copy Link

В лабе есть какой-то merge-конфликт с основной веткой master. Нужно его починить

В лабе есть какой-то merge-конфликт с основной веткой ```master```. Нужно его починить
DozorovaA.A commented 2024-10-19 13:19:30 +04:00
Review
Copy Link

Решено, насколько вижу
image

Решено, насколько вижу ![image](/attachments/7117baf1-ca39-403f-9e26-5f1fab7812db)
image.png
7.2 KiB
/dozorova_alena_lab_6/ConsoleApp1/bin
/dozorova_alena_lab_6/ConsoleApp1/obj