diff --git a/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/collectionMerging.xml b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/collectionMerging.xml index 09cb6556..0334ac8e 100644 --- a/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/collectionMerging.xml +++ b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/collectionMerging.xml @@ -2,9 +2,10 @@ + - - + + Rob Harrop Rod Johnson @@ -12,13 +13,14 @@ - - + + Juergen Hoeller + diff --git a/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/collectionMergingGen.xml b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/collectionMergingGeneric.xml similarity index 72% rename from test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/collectionMergingGen.xml rename to test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/collectionMergingGeneric.xml index d0b5941f..b838df6b 100644 --- a/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/collectionMergingGen.xml +++ b/test/Spring/Spring.Core.Tests/Data/Spring/Objects/Factory/Xml/collectionMergingGeneric.xml @@ -2,9 +2,11 @@ + + - - + + Rob Harrop Rod Johnson @@ -12,8 +14,8 @@ - - + + Juergen Hoeller 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 725e52b8..7bcf789e 100644 --- a/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2008.csproj +++ b/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2008.csproj @@ -812,7 +812,7 @@ - +