Spring/spring-net
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixing errors from invalid merge

Browse Source
This commit is contained in:
Steve Bohlen
2012-06-11 07:53:17 -04:00
parent 4afa7fc8a2
commit 440eea1fb1
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Spring/Spring.Web.Mvc/Context/Support/MvcApplicationContext.cs
View File

@@ -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; }
}

4
src/Spring/Spring.Web.Mvc3/Context/Support/MvcApplicationContext.cs
View File

@@ -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; }
}

4
test/Spring/Spring.Data.Tests/Transaction/Config/TxNamespaceParserTests.cs
View File

@@ -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; }
}