From 0ae1d06c2d6212a9dde15b482bc3bd8f5a8b18d6 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 4 Oct 2018 16:39:31 +0200
Subject: [PATCH] fix merge

---
 .../Repositories/Implement/ContentTypeRepositoryBase.cs       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs
index 93f8b123f7..19f3623680 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs
@@ -498,7 +498,7 @@ AND umbracoNode.id <> @id",
         /// <param name="propertyTypeChanges"></param>
         private void MoveVariantData(IDictionary<int, (ContentVariation, ContentVariation)> propertyTypeChanges)
         {
-            var defaultLangId = Database.First<int>(Sql().Select<LanguageDto>(x => x.Id).From<LanguageDto>().Where<LanguageDto>(x => x.IsDefaultVariantLanguage));
+            var defaultLangId = Database.First<int>(Sql().Select<LanguageDto>(x => x.Id).From<LanguageDto>().Where<LanguageDto>(x => x.IsDefault));
 
             //Group by the "To" variation so we can bulk update in the correct batches
             foreach(var g in propertyTypeChanges.GroupBy(x => x.Value.Item2))
@@ -532,7 +532,7 @@ AND umbracoNode.id <> @id",
         /// <param name="to"></param>
         private void MoveVariantData(IContentTypeComposition contentType, ContentVariation from, ContentVariation to)
         {
-            var defaultLangId = Database.First<int>(Sql().Select<LanguageDto>(x => x.Id).From<LanguageDto>().Where<LanguageDto>(x => x.IsDefaultVariantLanguage));
+            var defaultLangId = Database.First<int>(Sql().Select<LanguageDto>(x => x.Id).From<LanguageDto>().Where<LanguageDto>(x => x.IsDefault));
 
             var sqlPropertyTypeIds = Sql().Select<PropertyTypeDto>(x => x.Id).From<PropertyTypeDto>().Where<PropertyTypeDto>(x => x.ContentTypeId == contentType.Id);
             switch (to)