From ee7ee81098e4aa2c392ce14af131b0898f2b7590 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 16 Jan 2014 20:51:23 +1100
Subject: [PATCH] fixes merge issue

---
 src/Umbraco.Core/Constants-System.cs | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/src/Umbraco.Core/Constants-System.cs b/src/Umbraco.Core/Constants-System.cs
index f22c41d922..c4ce5b58f6 100644
--- a/src/Umbraco.Core/Constants-System.cs
+++ b/src/Umbraco.Core/Constants-System.cs
@@ -23,22 +23,5 @@
 			public const int RecycleBinMedia = -21;
 
 		}
-
-        /// <summary>
-        /// Defines the identifiers for Umbraco system nodes.
-        /// </summary>
-        public static class Web
-        {
-            /// <summary>
-            /// The preview cookie name
-            /// </summary>
-            public const string PreviewCookieName = "UMB_PREVIEW";
-
-            /// <summary>
-            /// The auth cookie name
-            /// </summary>
-            public const string AuthCookieName = "UMB_UCONTEXT";
-
-        }
 	}
 }
\ No newline at end of file