fixing errors from invalid merge

2012-06-11 07:53:17 -04:00
parent 4afa7fc8a2
commit 440eea1fb1
3 changed files with 6 additions and 6 deletions
--- a/test/Spring/Spring.Data.Tests/Transaction/Config/TxNamespaceParserTests.cs
+++ b/test/Spring/Spring.Data.Tests/Transaction/Config/TxNamespaceParserTests.cs
@@ -57,12 +57,12 @@ namespace Spring.Transaction.Config
                objectDefinitionReader.LoadObjectDefinitions(configurationResources);
            }

-            protected override string[] ConfigurationLocations
+            public override string[] ConfigurationLocations
            {
                get { return null; }
            }

-            protected override IResource[] ConfigurationResources
+            public override IResource[] ConfigurationResources
            {
                get { return null; }
            }