From 440eea1fb120b438516d8025ec6092ad2982aaa0 Mon Sep 17 00:00:00 2001
From: Steve Bohlen <sbohlen@gmail.com>
Date: Mon, 11 Jun 2012 07:53:17 -0400
Subject: [PATCH] fixing errors from invalid merge

---
 .../Spring.Web.Mvc/Context/Support/MvcApplicationContext.cs   | 4 ++--
 .../Spring.Web.Mvc3/Context/Support/MvcApplicationContext.cs  | 4 ++--
 .../Transaction/Config/TxNamespaceParserTests.cs              | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Spring/Spring.Web.Mvc/Context/Support/MvcApplicationContext.cs b/src/Spring/Spring.Web.Mvc/Context/Support/MvcApplicationContext.cs
index 9484fdbd..da2af790 100644
--- a/src/Spring/Spring.Web.Mvc/Context/Support/MvcApplicationContext.cs
+++ b/src/Spring/Spring.Web.Mvc/Context/Support/MvcApplicationContext.cs
@@ -119,7 +119,7 @@ namespace Spring.Context.Support
         /// <returns>
         /// An array of resource locations, or <see langword="null"/> if none.
         /// </returns>
-        protected override string[] ConfigurationLocations
+        public override string[] ConfigurationLocations
         {
             get { return _configurationLocations; }
         }
@@ -139,7 +139,7 @@ namespace Spring.Context.Support
         /// <returns>
         /// An array of <see cref="Spring.Core.IO.IResource"/>s, or <see langword="null"/> if none.
         /// </returns>
-        protected override IResource[] ConfigurationResources
+        public override IResource[] ConfigurationResources
         {
             get { return _configurationResources; }
         }
diff --git a/src/Spring/Spring.Web.Mvc3/Context/Support/MvcApplicationContext.cs b/src/Spring/Spring.Web.Mvc3/Context/Support/MvcApplicationContext.cs
index bfb6cf4b..9ba1d173 100644
--- a/src/Spring/Spring.Web.Mvc3/Context/Support/MvcApplicationContext.cs
+++ b/src/Spring/Spring.Web.Mvc3/Context/Support/MvcApplicationContext.cs
@@ -119,7 +119,7 @@ namespace Spring.Context.Support
         /// <returns>
         /// An array of resource locations, or <see langword="null"/> if none.
         /// </returns>
-        protected override string[] ConfigurationLocations
+        public override string[] ConfigurationLocations
         {
             get { return _configurationLocations; }
         }
@@ -139,7 +139,7 @@ namespace Spring.Context.Support
         /// <returns>
         /// An array of <see cref="Spring.Core.IO.IResource"/>s, or <see langword="null"/> if none.
         /// </returns>
-        protected override IResource[] ConfigurationResources
+        public override IResource[] ConfigurationResources
         {
             get { return _configurationResources; }
         }
diff --git a/test/Spring/Spring.Data.Tests/Transaction/Config/TxNamespaceParserTests.cs b/test/Spring/Spring.Data.Tests/Transaction/Config/TxNamespaceParserTests.cs
index 48d65ffa..ab14d605 100644
--- 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; }
             }