From d97b100bab5ff66b2bc0f99a7ceaf89a8e2c22ce Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 16 Jan 2019 02:18:02 +1100
Subject: [PATCH] fixes merge

---
 src/Umbraco.Core/Packaging/PackageDataInstallation.cs   | 4 ++++
 src/Umbraco.Core/Services/Implement/PackagingService.cs | 4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Core/Packaging/PackageDataInstallation.cs b/src/Umbraco.Core/Packaging/PackageDataInstallation.cs
index 2212a8957d..36066b104f 100644
--- a/src/Umbraco.Core/Packaging/PackageDataInstallation.cs
+++ b/src/Umbraco.Core/Packaging/PackageDataInstallation.cs
@@ -556,6 +556,10 @@ namespace Umbraco.Core.Packaging
             if (isListView != null)
                 contentType.IsContainer = isListView.Value.InvariantEquals("true");
 
+            var isElement = infoElement.Element("IsElement");
+            if (isElement != null)
+                contentType.IsElement = isElement.Value.InvariantEquals("true");
+
             //Name of the master corresponds to the parent and we need to ensure that the Parent Id is set
             var masterElement = infoElement.Element("Master");
             if (masterElement != null)
diff --git a/src/Umbraco.Core/Services/Implement/PackagingService.cs b/src/Umbraco.Core/Services/Implement/PackagingService.cs
index 55608e605e..a5c279fa21 100644
--- a/src/Umbraco.Core/Services/Implement/PackagingService.cs
+++ b/src/Umbraco.Core/Services/Implement/PackagingService.cs
@@ -43,10 +43,6 @@ namespace Umbraco.Core.Services.Implement
             ICreatedPackagesRepository createdPackages,
             IInstalledPackagesRepository installedPackages,
             IPackageInstallation packageInstallation)
-            var isElement = infoElement.Element("IsElement");
-            if (isListView != null)
-                contentType.IsElement = isElement.Value.InvariantEquals("true");
-
         {   
             _auditService = auditService;
             _createdPackages = createdPackages;