htamas1210/c-sharp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit was merged in pull request #1.
This commit is contained in:
Playmaker1210
2022-03-20 10:01:19 +01:00
parent cded7691b2 c1046619c6
commit eb6c46ae9b
3 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
.vs/c-sharp/project-colors.json
View File

@@ -35,7 +35,17 @@
"ProjectGuid": "f7beeb1c-eb73-42e8-a148-3db8c96b8d56",
"DisplayName": "RekurzivFaktorialis",
"ColorIndex": 6
},
"b8063178-720e-430c-b364-dc3f1dfce42c": {
"ProjectGuid": "b8063178-720e-430c-b364-dc3f1dfce42c",
"DisplayName": "RegularExpressions",
"ColorIndex": 7
},
"a2fe74e1-b743-11d0-ae1a-00a0c90fffc3": {
"ProjectGuid": "a2fe74e1-b743-11d0-ae1a-00a0c90fffc3",
"DisplayName": "Miscellaneous Files",
"ColorIndex": -1
}
},
"NextColorIndex": 7
"NextColorIndex": 8
}

BIN
.vs/c-sharp/v17/.suo
View File

Binary file not shown.

10
c-sharp.sln
View File

@@ -18,10 +18,14 @@ EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RekurzivFaktorialis", "RekurzivFaktorialis\RekurzivFaktorialis.csproj", "{F7BEEB1C-EB73-42E8-A148-3DB8C96B8D56}"
EndProject
<<<<<<< HEAD
<<<<<<< HEAD
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RegularExpressions", "RegularExpressions\RegularExpressions.csproj", "{B8063178-720E-430C-B364-DC3F1DFCE42C}"
=======
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RekurzivHatvany", "RekurzivHatvany\RekurzivHatvany.csproj", "{DA385DD5-70CE-4750-BDF8-03915D70F5B9}"
>>>>>>> c1046619c649e6be76c3e8746f0c75af47881513
=======
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RekurzivHatvany", "RekurzivHatvany\RekurzivHatvany.csproj", "{DA385DD5-70CE-4750-BDF8-03915D70F5B9}"
>>>>>>> c1046619c649e6be76c3e8746f0c75af47881513
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -57,16 +61,22 @@ Global
{F7BEEB1C-EB73-42E8-A148-3DB8C96B8D56}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F7BEEB1C-EB73-42E8-A148-3DB8C96B8D56}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F7BEEB1C-EB73-42E8-A148-3DB8C96B8D56}.Release|Any CPU.Build.0 = Release|Any CPU
<<<<<<< HEAD
<<<<<<< HEAD
{B8063178-720E-430C-B364-DC3F1DFCE42C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B8063178-720E-430C-B364-DC3F1DFCE42C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B8063178-720E-430C-B364-DC3F1DFCE42C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B8063178-720E-430C-B364-DC3F1DFCE42C}.Release|Any CPU.Build.0 = Release|Any CPU
=======
=======
>>>>>>> c1046619c649e6be76c3e8746f0c75af47881513
{DA385DD5-70CE-4750-BDF8-03915D70F5B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DA385DD5-70CE-4750-BDF8-03915D70F5B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DA385DD5-70CE-4750-BDF8-03915D70F5B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DA385DD5-70CE-4750-BDF8-03915D70F5B9}.Release|Any CPU.Build.0 = Release|Any CPU
<<<<<<< HEAD
>>>>>>> c1046619c649e6be76c3e8746f0c75af47881513
=======
>>>>>>> c1046619c649e6be76c3e8746f0c75af47881513
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution