fixes merge issue

This commit is contained in:
Shannon
2014-01-16 20:51:23 +11:00
parent f4b707e928
commit ee7ee81098

View File

@@ -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";
}
}
}