Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

fixing merge errors in 2008 csproj files

  • Loading branch information...
commit e5c8a0396afb6f7e581b59405cf4cd1c49424998 1 parent a969ebd
@sbohlen sbohlen authored
View
2  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" />
View
2  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" />
Please sign in to comment.
Something went wrong with that request. Please try again.