Skip to content

Commit 64986f2

Browse files
committed
Fix bad merge
1 parent d087ffc commit 64986f2

File tree

2 files changed

+7
-85
lines changed

2 files changed

+7
-85
lines changed

src/Nerdbank.GitVersioning.sln

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Nerdbank.GitVersioning.Task
2626
EndProject
2727
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MSBuildExtensionTask", "MSBuildExtensionTask\MSBuildExtensionTask.csproj", "{568CD02D-49C4-49DB-A34D-2DE9D7A0FE85}"
2828
EndProject
29+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nbgv", "nbgv\nbgv.csproj", "{EF4DAF23-6CE9-48C5-84C5-80AC80D3D07D}"
30+
EndProject
2931
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cake.GitVersioning", "Cake.GitVersioning\Cake.GitVersioning.csproj", "{1F267A97-DFE3-4166-83B1-9D236B7A09BD}"
3032
EndProject
3133
Global
@@ -52,6 +54,10 @@ Global
5254
{568CD02D-49C4-49DB-A34D-2DE9D7A0FE85}.Debug|Any CPU.Build.0 = Debug|Any CPU
5355
{568CD02D-49C4-49DB-A34D-2DE9D7A0FE85}.Release|Any CPU.ActiveCfg = Release|Any CPU
5456
{568CD02D-49C4-49DB-A34D-2DE9D7A0FE85}.Release|Any CPU.Build.0 = Release|Any CPU
57+
{EF4DAF23-6CE9-48C5-84C5-80AC80D3D07D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
58+
{EF4DAF23-6CE9-48C5-84C5-80AC80D3D07D}.Debug|Any CPU.Build.0 = Debug|Any CPU
59+
{EF4DAF23-6CE9-48C5-84C5-80AC80D3D07D}.Release|Any CPU.ActiveCfg = Release|Any CPU
60+
{EF4DAF23-6CE9-48C5-84C5-80AC80D3D07D}.Release|Any CPU.Build.0 = Release|Any CPU
5561
{1F267A97-DFE3-4166-83B1-9D236B7A09BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
5662
{1F267A97-DFE3-4166-83B1-9D236B7A09BD}.Debug|Any CPU.Build.0 = Debug|Any CPU
5763
{1F267A97-DFE3-4166-83B1-9D236B7A09BD}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -61,6 +67,6 @@ Global
6167
HideSolutionNode = FALSE
6268
EndGlobalSection
6369
GlobalSection(ExtensibilityGlobals) = postSolution
64-
SolutionGuid = {03CE16EE-A939-43FB-B846-92EB3A797ECF}
70+
SolutionGuid = {4CF7AA29-5BBD-4294-9C92-DA689CF57200}
6571
EndGlobalSection
6672
EndGlobal

src/Nerdbank.GitVersioning.sln.orig

Lines changed: 0 additions & 84 deletions
This file was deleted.

0 commit comments

Comments
 (0)