From 86e640b1d030b28457c9c6df4313f81084e5befe Mon Sep 17 00:00:00 2001
From: Renaud Paquay <rpaquay@microsoft.com>
Date: Thu, 22 Jul 2010 23:17:37 -0700
Subject: [PATCH] Fix merge conflicts...

--HG--
branch : dev
---
 .../Core/Contents/Settings/ContentTypeSettings.cs      | 10 +---------
 .../Services/ContentDefinitionService.cs               |  1 +
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/Orchard.Web/Core/Contents/Settings/ContentTypeSettings.cs b/src/Orchard.Web/Core/Contents/Settings/ContentTypeSettings.cs
index 793893a63..34cbb05ab 100644
--- a/src/Orchard.Web/Core/Contents/Settings/ContentTypeSettings.cs
+++ b/src/Orchard.Web/Core/Contents/Settings/ContentTypeSettings.cs
@@ -1,16 +1,8 @@
-using Orchard.ContentManagement.MetaData.Builders;
-
-namespace Orchard.Core.Contents.Settings {
+namespace Orchard.Core.Contents.Settings {
     public class ContentTypeSettings {
         /// <summary>
         /// This setting is used to display a Content Type in Content Mamagement menu like
         /// </summary>
         public bool Creatable { get; set; }
     }
-
-    public static class MetaDataExtensions {
-        public static ContentTypeDefinitionBuilder Creatable(this ContentTypeDefinitionBuilder builder, bool creatable = true) {
-            return builder.WithSetting(typeof(ContentTypeSettings).Name + ".Creatable", creatable.ToString());
-        }
-    }
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Services/ContentDefinitionService.cs b/src/Orchard.Web/Modules/Orchard.ContentTypes/Services/ContentDefinitionService.cs
index 33ea55239..c92fdf363 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Services/ContentDefinitionService.cs
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Services/ContentDefinitionService.cs
@@ -7,6 +7,7 @@ using Orchard.ContentManagement.Drivers;
 using Orchard.ContentManagement.MetaData;
 using Orchard.ContentManagement.MetaData.Models;
 using Orchard.ContentTypes.ViewModels;
+using Orchard.Core.Contents.Extensions;
 using Orchard.Core.Contents.Settings;
 using Orchard.Localization;