Skip to content

Commit adba9c6

Browse files
committed
Fixing conflicts in stack.sln
1 parent 1ffb74d commit adba9c6

File tree

1 file changed

+29
-0
lines changed

1 file changed

+29
-0
lines changed

src/StackAdmin/Stack.sln

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Dns", "Dns\Command
8181
EndProject
8282
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Dns.Test", "Dns\Commands.Dns.Test\Commands.Dns.Test.csproj", "{81E4373B-42EC-445E-9A40-06C44F29099A}"
8383
EndProject
84+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StorageSDK", "Storage.Management\SDK\StorageSDK.csproj", "{CCC1F6C7-E2CE-47B3-BD64-8EFD17823E20}"
85+
EndProject
86+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Management.Storage.Test", "Storage.Management\Commands.Management.Storage.Test\Commands.Management.Storage.Test.csproj", "{7D1D3B56-4EB4-4819-86FD-43330DED8EE7}"
87+
EndProject
8488
Global
8589
GlobalSection(SolutionConfigurationPlatforms) = preSolution
8690
Debug|Any CPU = Debug|Any CPU
@@ -511,6 +515,30 @@ Global
511515
{81E4373B-42EC-445E-9A40-06C44F29099A}.Release|x64.Build.0 = Release|Any CPU
512516
{81E4373B-42EC-445E-9A40-06C44F29099A}.Release|x86.ActiveCfg = Release|Any CPU
513517
{81E4373B-42EC-445E-9A40-06C44F29099A}.Release|x86.Build.0 = Release|Any CPU
518+
{CCC1F6C7-E2CE-47B3-BD64-8EFD17823E20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
519+
{CCC1F6C7-E2CE-47B3-BD64-8EFD17823E20}.Debug|Any CPU.Build.0 = Debug|Any CPU
520+
{CCC1F6C7-E2CE-47B3-BD64-8EFD17823E20}.Debug|x64.ActiveCfg = Debug|Any CPU
521+
{CCC1F6C7-E2CE-47B3-BD64-8EFD17823E20}.Debug|x64.Build.0 = Debug|Any CPU
522+
{CCC1F6C7-E2CE-47B3-BD64-8EFD17823E20}.Debug|x86.ActiveCfg = Debug|Any CPU
523+
{CCC1F6C7-E2CE-47B3-BD64-8EFD17823E20}.Debug|x86.Build.0 = Debug|Any CPU
524+
{CCC1F6C7-E2CE-47B3-BD64-8EFD17823E20}.Release|Any CPU.ActiveCfg = Release|Any CPU
525+
{CCC1F6C7-E2CE-47B3-BD64-8EFD17823E20}.Release|Any CPU.Build.0 = Release|Any CPU
526+
{CCC1F6C7-E2CE-47B3-BD64-8EFD17823E20}.Release|x64.ActiveCfg = Release|Any CPU
527+
{CCC1F6C7-E2CE-47B3-BD64-8EFD17823E20}.Release|x64.Build.0 = Release|Any CPU
528+
{CCC1F6C7-E2CE-47B3-BD64-8EFD17823E20}.Release|x86.ActiveCfg = Release|Any CPU
529+
{CCC1F6C7-E2CE-47B3-BD64-8EFD17823E20}.Release|x86.Build.0 = Release|Any CPU
530+
{7D1D3B56-4EB4-4819-86FD-43330DED8EE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
531+
{7D1D3B56-4EB4-4819-86FD-43330DED8EE7}.Debug|Any CPU.Build.0 = Debug|Any CPU
532+
{7D1D3B56-4EB4-4819-86FD-43330DED8EE7}.Debug|x64.ActiveCfg = Debug|Any CPU
533+
{7D1D3B56-4EB4-4819-86FD-43330DED8EE7}.Debug|x64.Build.0 = Debug|Any CPU
534+
{7D1D3B56-4EB4-4819-86FD-43330DED8EE7}.Debug|x86.ActiveCfg = Debug|Any CPU
535+
{7D1D3B56-4EB4-4819-86FD-43330DED8EE7}.Debug|x86.Build.0 = Debug|Any CPU
536+
{7D1D3B56-4EB4-4819-86FD-43330DED8EE7}.Release|Any CPU.ActiveCfg = Release|Any CPU
537+
{7D1D3B56-4EB4-4819-86FD-43330DED8EE7}.Release|Any CPU.Build.0 = Release|Any CPU
538+
{7D1D3B56-4EB4-4819-86FD-43330DED8EE7}.Release|x64.ActiveCfg = Release|Any CPU
539+
{7D1D3B56-4EB4-4819-86FD-43330DED8EE7}.Release|x64.Build.0 = Release|Any CPU
540+
{7D1D3B56-4EB4-4819-86FD-43330DED8EE7}.Release|x86.ActiveCfg = Release|Any CPU
541+
{7D1D3B56-4EB4-4819-86FD-43330DED8EE7}.Release|x86.Build.0 = Release|Any CPU
514542
EndGlobalSection
515543
GlobalSection(SolutionProperties) = preSolution
516544
HideSolutionNode = FALSE
@@ -531,6 +559,7 @@ Global
531559
{BDF9F606-E419-4F24-B84F-B3BE6A92E9FA} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
532560
{4C2FE49A-09E1-4979-AD46-CD64FD04C8F7} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
533561
{81E4373B-42EC-445E-9A40-06C44F29099A} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
562+
{7D1D3B56-4EB4-4819-86FD-43330DED8EE7} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
534563
EndGlobalSection
535564
GlobalSection(ExtensibilityGlobals) = postSolution
536565
SolutionGuid = {E3BEFC51-2FF1-4E69-B5D2-36E4D7446B7C}

0 commit comments

Comments
 (0)