Merge branch 'master' of http://192.168.50.111:13000/king/ResourceUsageAPI
This commit is contained in:
@@ -1,8 +1,14 @@
|
||||
{
|
||||
"version": 2,
|
||||
<<<<<<< HEAD
|
||||
"dgSpecHash": "21qKVFLqEJQ=",
|
||||
"success": true,
|
||||
"projectFilePath": "C:\\Work\\DEV\\ResourceUsageAPI\\ResourceMonitorService.csproj",
|
||||
=======
|
||||
"dgSpecHash": "c9QUeYvHFTQ=",
|
||||
"success": true,
|
||||
"projectFilePath": "C:\\din\\dev\\ResourceUsageAPI\\ResourceMonitorService.csproj",
|
||||
>>>>>>> 28da999de06ef6db877e7001bd19f327db1d0910
|
||||
"expectedPackageFiles": [
|
||||
"C:\\Users\\dinxs\\.nuget\\packages\\microsoft.aspnetcore.jsonpatch\\9.0.0\\microsoft.aspnetcore.jsonpatch.9.0.0.nupkg.sha512",
|
||||
"C:\\Users\\dinxs\\.nuget\\packages\\microsoft.aspnetcore.mvc.newtonsoftjson\\9.0.0\\microsoft.aspnetcore.mvc.newtonsoftjson.9.0.0.nupkg.sha512",
|
||||
|
||||
Reference in New Issue
Block a user