PBS2H23AMA/PMC_Projekt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://git.bib.de/PBS2H23AMA/PMC_Projekt

Browse Source 
# Conflicts:
#	PMCProjekt/.vs/PMCProjekt/v17/.suo
#	PMCProjekt/.vs/PMCProjekt/v17/DocumentLayout.json
#	PMCProjekt/PMCProjekt/Program.cs
#	PMCProjekt/PMCProjekt/obj/Debug/net8.0/PMCProjekt.AssemblyInfo.cs
#	PMCProjekt/PMCProjekt/obj/Debug/net8.0/PMCProjekt.AssemblyInfoInputs.cache
This commit is contained in:
NBMANTZELOS\bib
2024-06-14 10:42:47 +02:00
parent 3a72164cfc 17dccf1f6d
commit 93ee8edf62
4 changed files with 29 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
PMCProjekt/.vs/PMCProjekt/v17/DocumentLayout.json
View File

@@ -38,9 +38,15 @@
"Title": "Program.cs",
"DocumentMoniker": "C:\\Schule\\PMC\\PMCProjekt\\PMCProjekt\\PMCProjekt\\Program.cs",
"RelativeDocumentMoniker": "PMCProjekt\\Program.cs",
<<<<<<< HEAD
"ToolTip": "C:\\Schule\\PMC\\PMCProjekt\\PMCProjekt\\PMCProjekt\\Program.cs*",
"RelativeToolTip": "PMCProjekt\\Program.cs*",
"ViewState": "AQIAADYAAAAAAAAAAAAAAEIAAABAAAAA",
=======
"ToolTip": "C:\\Schule\\PMC\\PMCProjekt\\PMCProjekt\\PMCProjekt\\Program.cs",
"RelativeToolTip": "PMCProjekt\\Program.cs",
"ViewState": "AQIAACUAAAAAAAAAAAAqwDcAAABAAAAA",
>>>>>>> 17dccf1f6d116de89483d6a78bb50c19dc487b23
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2024-05-29T10:43:22.805Z",
"EditorCaption": ""