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/PMCProjekt/obj/Debug/net8.0/PMCProjekt.assets.cache
#	PMCProjekt/PMCProjekt/obj/project.nuget.cache
This commit is contained in:
Philipp Morasch 2024-06-07 10:33:48 +02:00
commit 3fb5238d93
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
PMCProjekt/PMCProjekt/obj/project.nuget.cache
View File

@ -1,8 +1,14 @@
{ {
"version": 2, "version": 2,
<<<<<<< HEAD
"dgSpecHash": "ItlwKJfGBL8aX97fM99vrHqw0LVjEpg++g7r51coCyOakv6D0zaCHR9EMxFndLxrHUU41diVC5KD/hJnr3cXVA==", "dgSpecHash": "ItlwKJfGBL8aX97fM99vrHqw0LVjEpg++g7r51coCyOakv6D0zaCHR9EMxFndLxrHUU41diVC5KD/hJnr3cXVA==",
"success": true, "success": true,
"projectFilePath": "C:\\Users\\bib\\Documents\\PMCProjekt\\PMCProjekt\\PMCProjekt\\PMCProjekt.csproj", "projectFilePath": "C:\\Users\\bib\\Documents\\PMCProjekt\\PMCProjekt\\PMCProjekt\\PMCProjekt.csproj",
=======
"dgSpecHash": "GuZxYKqyxPKXrLIHTLiW4dbsfQtATzQU40yfFQuTfNrD+HunMVP/cZM5+daazdtJBtftPKPqAU5vRUnfnCNvqA==",
"success": true,
"projectFilePath": "C:\\Schule\\PMC\\PMCProjekt\\PMCProjekt\\PMCProjekt\\PMCProjekt.csproj",
>>>>>>> f09fa2c5f5f194e2a4e52d7bff13d999efbc7f7b
"expectedPackageFiles": [ "expectedPackageFiles": [
"C:\\Users\\bib\\.nuget\\packages\\bouncycastle.cryptography\\2.2.1\\bouncycastle.cryptography.2.2.1.nupkg.sha512", "C:\\Users\\bib\\.nuget\\packages\\bouncycastle.cryptography\\2.2.1\\bouncycastle.cryptography.2.2.1.nupkg.sha512",
"C:\\Users\\bib\\.nuget\\packages\\google.protobuf\\3.25.1\\google.protobuf.3.25.1.nupkg.sha512", "C:\\Users\\bib\\.nuget\\packages\\google.protobuf\\3.25.1\\google.protobuf.3.25.1.nupkg.sha512",