From edfc16e4912f4b1ff8bb6d77ed462d58ac2acb59 Mon Sep 17 00:00:00 2001
From: Sipke Schoorstra <sipke@ideliverable.com>
Date: Fri, 20 Feb 2015 15:03:21 +0100
Subject: [PATCH] Fixed Layouts import/export merge issue.

---
 .../Modules/Orchard.Layouts/Drivers/LayoutPartDriver.cs         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Orchard.Web/Modules/Orchard.Layouts/Drivers/LayoutPartDriver.cs b/src/Orchard.Web/Modules/Orchard.Layouts/Drivers/LayoutPartDriver.cs
index c4f2a2ce9..9b56f1ac0 100644
--- a/src/Orchard.Web/Modules/Orchard.Layouts/Drivers/LayoutPartDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.Layouts/Drivers/LayoutPartDriver.cs
@@ -113,7 +113,7 @@ namespace Orchard.Layouts.Drivers {
         }
 
         protected override void Importing(LayoutPart part, ImportContentContext context) {
-            context.ImportChildEl(part.PartDefinition.Name, "LayoutState", s => {
+            context.ImportChildEl(part.PartDefinition.Name, "LayoutData", s => {
                 part.LayoutData = s;
                 _layoutManager.Importing(new ImportLayoutContext {
                     Layout = part,