fixing merge errors in 2008 csproj files
This commit is contained in:
@@ -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" />
|
||||
|
||||
@@ -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" />
|
||||
|
||||
Reference in New Issue
Block a user