Compare commits

...

5 Commits

Author SHA1 Message Date
fa9e0599e7 Merge pull request 'test1' (#10) from Branch1 into main
Reviewed-on: #10
2024-11-25 00:22:44 +04:00
b4c4afafbb test1 2024-11-25 00:20:24 +04:00
411fdb5d7c Merge pull request 'merged2' (#8) from Branch2 into main
Reviewed-on: #8
2024-11-25 00:18:39 +04:00
ec6b7a8c19 Merge pull request 'merged1' (#9) from Branch1 into main
Reviewed-on: #9
2024-11-25 00:17:42 +04:00
6c281c9486 merged1 2024-11-25 00:17:04 +04:00
4 changed files with 15 additions and 0 deletions

View File

@ -129,6 +129,9 @@
<ItemGroup>
<ClCompile Include="main.cpp" />
</ItemGroup>
<ItemGroup>
<Text Include="test.txt" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>

View File

@ -19,4 +19,7 @@
<Filter>Исходные файлы</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<Text Include="test.txt" />
</ItemGroup>
</Project>

View File

@ -8,6 +8,14 @@ int n;
void func() {
printf("yakjhojjosssssssssssssss");
printf("yakjhojjosssssssssssssss");
printf("yakjhojjosssssssssssssss");
printf("yakjhojjosssssssssssssss");
printf("yakjhojjosssssssssssssss");
printf("yayasdasdasdddfsdfdsfsfsfad");
printf("yayasdasdasdddfsdfdsfsfsfad");

1
Lab17/Lab17/test.txt Normal file
View File

@ -0,0 +1 @@
abc