From 4619b7b67b96099d49ad7c55a3473f644e518929 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 3 May 2016 22:30:45 +0200
Subject: [PATCH] fixes merge/rebase

---
 .../Persistence/UnitOfWork/NPocoUnitOfWorkProvider.cs           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Core/Persistence/UnitOfWork/NPocoUnitOfWorkProvider.cs b/src/Umbraco.Core/Persistence/UnitOfWork/NPocoUnitOfWorkProvider.cs
index dcea35cedb..a3a292d0b1 100644
--- a/src/Umbraco.Core/Persistence/UnitOfWork/NPocoUnitOfWorkProvider.cs
+++ b/src/Umbraco.Core/Persistence/UnitOfWork/NPocoUnitOfWorkProvider.cs
@@ -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!
         }