From 742b5566c32f26f42f63fdfb47ece8b751dc55b0 Mon Sep 17 00:00:00 2001 From: VladimirMangos Date: Tue, 21 Oct 2008 16:28:37 +0400 Subject: [PATCH] * Manually resolve conflict with last commit in VC90 sollution --- win/mangosdVC90.sln | 2 -- 1 file changed, 2 deletions(-) diff --git a/win/mangosdVC90.sln b/win/mangosdVC90.sln index 34d8e103a..117c37e11 100644 --- a/win/mangosdVC90.sln +++ b/win/mangosdVC90.sln @@ -48,8 +48,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gensvnrevision", "VC90\gens EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACEWraper", "VC90\ACE_vc9.vcproj", "{BD537C9A-FECA-1BAD-6757-8A6348EA12C8}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gensvnrevision", "VC90\gensvnrevision.vcproj", "{803F488E-4C5A-4866-8D5C-1E6C03C007C2}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32