From e5c8a0396afb6f7e581b59405cf4cd1c49424998 Mon Sep 17 00:00:00 2001
From: Steve Bohlen <sbohlen@gmail.com>
Date: Mon, 20 Aug 2012 11:09:55 -0400
Subject: [PATCH] fixing merge errors in 2008 csproj files

---
 src/Spring/Spring.Core/Spring.Core.2008.csproj              | 2 +-
 test/Spring/Spring.Core.Tests/Spring.Core.Tests.2008.csproj | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Spring/Spring.Core/Spring.Core.2008.csproj b/src/Spring/Spring.Core/Spring.Core.2008.csproj
index 2dcd89a4..3ea6eac4 100644
--- a/src/Spring/Spring.Core/Spring.Core.2008.csproj
+++ b/src/Spring/Spring.Core/Spring.Core.2008.csproj
@@ -708,7 +708,7 @@
     <Compile Include="Objects\Factory\Parsing\ObjectDefinitionParsingException.cs" />
     <Compile Include="Objects\Factory\Parsing\Problem.cs" />
     <Compile Include="Objects\Factory\Parsing\ReaderContext.cs" />
-    <Compile Include="Objects\Factory\Support\DelegatingFactoryObject.cs" />
+    <Compile Include="Objects\Factory\Support\DelegateInvokingFactoryObject.cs" />
     <Compile Include="Objects\Factory\Support\IObjectDefinitionRegistryPostProcessor.cs" />
     <Compile Include="Objects\Factory\Support\ObjectScope.cs" />
     <Compile Include="Util\ConstructorInstantiationInfo.cs" />
diff --git a/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2008.csproj b/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2008.csproj
index 0c4a138c..ace68efb 100644
--- a/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2008.csproj
+++ b/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2008.csproj
@@ -338,7 +338,7 @@
     <Compile Include="Objects\Factory\Config\VariablePlaceholderConfigurerTests.cs" />
     <Compile Include="Objects\Factory\DefaultListableObjectFactoryPerfTests.cs" />
     <Compile Include="Objects\Factory\DummyConfigurableFactory.cs" />
-    <Compile Include="Objects\Factory\Support\DelegatingFactoryObjectTests.cs" />
+    <Compile Include="Objects\Factory\Support\DelegateInvokingFactoryObjectTests.cs" />
     <Compile Include="Objects\Factory\Support\ManagedNameValueCollectionTests.cs" />
     <Compile Include="Objects\Factory\Support\ManagedListTests.cs" />
     <Compile Include="Objects\Factory\Support\ManagedDictionaryTests.cs" />