Fix merge problem

2013-08-23 08:57:02 +02:00
parent 61149f8112
commit 1e76cf67d3
1 changed files with 0 additions and 2 deletions
--- a/src/Umbraco.Web.UI/install/steps/Database.ascx.designer.cs
+++ b/src/Umbraco.Web.UI/install/steps/Database.ascx.designer.cs
@@ -102,8 +102,6 @@ namespace Umbraco.Web.UI.Install.Steps {
        /// </remarks>
        protected global::System.Web.UI.WebControls.TextBox DatabaseName;

-        protected global::System.Web.UI.WebControls.CheckBox DatabaseIntegratedSecurity;
-
        /// <summary>
        /// DatabaseIntegratedSecurity control.
        /// </summary>