Fixed borked solution file

subsonic · Jul 23, 2010 · 3f91bc3 · 3f91bc3
1 parent e0270ef
commit 3f91bc3
Show file tree

Hide file tree

Showing 2 changed files with 7,802 additions and 11 deletions.
diff --git a/SubSonic.Linq.sln b/SubSonic.Linq.sln
@@ -5,11 +5,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SubSonic.Core", "SubSonic.C
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SubSonic.Tests", "SubSonic.Tests\SubSonic.Tests.csproj", "{6B23B65F-2E09-4531-BDA1-A6EA08CBA843}"
 EndProject
-<<<<<<< HEAD
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PerfRunner", "PerfRunner\PerfRunner.csproj", "{45BA3F78-05F5-4344-AD0D-309F2AED9A0A}"
-=======
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SubSonic.Tests.Unit", "SubSonic.Tests.Unit\SubSonic.Tests.Unit.csproj", "{29F51F2F-115C-4AFE-85CB-1F34498C6AD3}"
->>>>>>> 081569933c8ed7d3dbd442d1798f26b9375b5abc
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -25,17 +21,10 @@ Global
 		{6B23B65F-2E09-4531-BDA1-A6EA08CBA843}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6B23B65F-2E09-4531-BDA1-A6EA08CBA843}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6B23B65F-2E09-4531-BDA1-A6EA08CBA843}.Release|Any CPU.Build.0 = Release|Any CPU
-<<<<<<< HEAD
-		{45BA3F78-05F5-4344-AD0D-309F2AED9A0A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{45BA3F78-05F5-4344-AD0D-309F2AED9A0A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{45BA3F78-05F5-4344-AD0D-309F2AED9A0A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{45BA3F78-05F5-4344-AD0D-309F2AED9A0A}.Release|Any CPU.Build.0 = Release|Any CPU
-=======
 		{29F51F2F-115C-4AFE-85CB-1F34498C6AD3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{29F51F2F-115C-4AFE-85CB-1F34498C6AD3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{29F51F2F-115C-4AFE-85CB-1F34498C6AD3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{29F51F2F-115C-4AFE-85CB-1F34498C6AD3}.Release|Any CPU.Build.0 = Release|Any CPU
->>>>>>> 081569933c8ed7d3dbd442d1798f26b9375b5abc
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE