Merge pull request 'test1' (#10 ) from Branch1 into main

Reviewed-on: #10
test1
2024-11-25 00:22:44 +04:00 · 2024-11-25 00:20:24 +04:00 · 2024-11-25 00:18:39 +04:00 · 2024-11-25 00:17:42 +04:00 · 2024-11-25 00:17:04 +04:00
3 changed files with 12 additions and 1 deletions
--- a/Lab17/Lab17/Lab17.vcxproj.filters
+++ b/Lab17/Lab17/Lab17.vcxproj.filters
@ -19,4 +19,7 @@
      <Filter>Исходные файлы</Filter>
    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <Text Include="test.txt" />
  </ItemGroup>
 </Project>
--- a/Lab17/Lab17/main.cpp
+++ b/Lab17/Lab17/main.cpp
@ -8,6 +8,14 @@ int n;
 void func() {
 	printf("yakjhojjosssssssssssssss");
 	printf("yakjhojjosssssssssssssss");
 	printf("yakjhojjosssssssssssssss");
 	printf("yakjhojjosssssssssssssss");
 	printf("yakjhojjosssssssssssssss");
 	printf("yayasdasdasdddfsdfdsfsfsfad");
 	printf("yayasdasdasdddfsdfdsfsfsfad");
--- a/Lab17/Lab17/test.txt
+++ b/Lab17/Lab17/test.txt
@ -1 +1 @@
-acb
+abc
Author	SHA1	Message	Date
GuyWhoLikePizza	fa9e0599e7	Merge pull request 'test1' (#10 ) from Branch1 into main Reviewed-on: #10	2024-11-25 00:22:44 +04:00
MaximNguen	b4c4afafbb	test1	2024-11-25 00:20:24 +04:00
GuyWhoLikePizza	411fdb5d7c	Merge pull request 'merged2' (#8 ) from Branch2 into main Reviewed-on: #8	2024-11-25 00:18:39 +04:00
GuyWhoLikePizza	ec6b7a8c19	Merge pull request 'merged1' (#9 ) from Branch1 into main Reviewed-on: #9	2024-11-25 00:17:42 +04:00
MaximNguen	6c281c9486	merged1	2024-11-25 00:17:04 +04:00