fixes merge issue

2013-04-10 04:04:33 +06:00
parent 1f86d8c562
commit 1b086e2267
1 changed files with 1 additions and 0 deletions
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/editContent.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/editContent.aspx.cs
@@ -88,6 +88,7 @@ namespace umbraco.cms.presentation
                }
            }

+            _cControl = new controls.ContentControl(_document, _canPublish, "TabView1");

            _cControl.ID = "TabView1";