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

This reverts commit a63f4e4b87.
This commit is contained in:
NBMANTZELOS\bib
2024-06-14 10:44:40 +02:00
parent a63f4e4b87
commit 0c6c6cd74b
4 changed files with 29 additions and 0 deletions

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": ""