fixing merge of csproj files

This commit is contained in:
Steve Bohlen
2012-08-20 10:16:47 -04:00
parent c641c5227f
commit d4fff365ac
2 changed files with 2 additions and 2 deletions

View File

@@ -710,7 +710,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="Stereotype\ControllerAttribute.cs" />

View File

@@ -341,6 +341,7 @@
<Compile Include="Objects\Factory\DefaultListableObjectFactoryPerfTests.cs" />
<Compile Include="Objects\Factory\DummyConfigurableFactory.cs" />
<Compile Include="Objects\Factory\ObjectFactoryUtils_PreserveOrderInHierarchy_Tests.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" />
@@ -358,7 +359,6 @@
<Compile Include="Objects\LazyTestObject.cs" />
<Compile Include="Objects\Support\AbstractSharedStateFactoryTests.cs" />
<Compile Include="Objects\Support\ByTypeSharedStateProviderTests.cs" />
<Compile Include="Objects\Factory\Support\DelegatingFactoryObjectTests.cs" />
<Compile Include="Objects\Support\MethodInvokerTests.cs">
<SubType>Code</SubType>
</Compile>