Merge branch 'master' of http://192.168.50.111:13000/king/ResourceUsageAPI
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
{
|
||||
"format": 1,
|
||||
"restore": {
|
||||
<<<<<<< HEAD
|
||||
"C:\\Work\\DEV\\ResourceUsageAPI\\ResourceMonitorService.csproj": {}
|
||||
},
|
||||
"projects": {
|
||||
@@ -12,6 +13,19 @@
|
||||
"projectPath": "C:\\Work\\DEV\\ResourceUsageAPI\\ResourceMonitorService.csproj",
|
||||
"packagesPath": "C:\\Users\\dinxs\\.nuget\\packages\\",
|
||||
"outputPath": "C:\\Work\\DEV\\ResourceUsageAPI\\obj\\",
|
||||
=======
|
||||
"C:\\din\\dev\\ResourceUsageAPI\\ResourceMonitorService.csproj": {}
|
||||
},
|
||||
"projects": {
|
||||
"C:\\din\\dev\\ResourceUsageAPI\\ResourceMonitorService.csproj": {
|
||||
"version": "1.0.0",
|
||||
"restore": {
|
||||
"projectUniqueName": "C:\\din\\dev\\ResourceUsageAPI\\ResourceMonitorService.csproj",
|
||||
"projectName": "ResourceMonitorService",
|
||||
"projectPath": "C:\\din\\dev\\ResourceUsageAPI\\ResourceMonitorService.csproj",
|
||||
"packagesPath": "C:\\Users\\dinxs\\.nuget\\packages\\",
|
||||
"outputPath": "C:\\din\\dev\\ResourceUsageAPI\\obj\\",
|
||||
>>>>>>> 28da999de06ef6db877e7001bd19f327db1d0910
|
||||
"projectStyle": "PackageReference",
|
||||
"configFilePaths": [
|
||||
"C:\\Users\\dinxs\\AppData\\Roaming\\NuGet\\NuGet.Config"
|
||||
|
||||
Reference in New Issue
Block a user