fixes merge/rebase

This commit is contained in:
Shannon
2016-05-03 22:30:45 +02:00
parent 0b1f12c823
commit 4619b7b67b

View File

@@ -38,7 +38,7 @@ namespace Umbraco.Core.Persistence.UnitOfWork
/// </remarks>
internal NPocoUnitOfWorkProvider(ILogger logger)
{
_databaseFactory = new DefaultDatabaseFactory(GlobalSettings.UmbracoConnectionName, GetDefaultSqlSyntaxProviders(logger), logger, new DefaultScopeContextFactory());
_databaseFactory = new DefaultDatabaseFactory(GlobalSettings.UmbracoConnectionName, GetDefaultSqlSyntaxProviders(logger), logger, new DefaultScopeContextAdapter());
// careful, _repositoryFactory remains null!
}