From 3b4487c836ee55dc94a30fd7313dcd503f93bb87 Mon Sep 17 00:00:00 2001
From: perploug <pph@umbraco.dk>
Date: Fri, 7 Mar 2014 10:18:30 +0100
Subject: [PATCH] Fixes: Weird merge issue with dashboard.config

---
 src/Umbraco.Web.UI/config/Dashboard.Release.config | 13 ++++---------
 src/Umbraco.Web.UI/config/Dashboard.config         |  2 +-
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/Umbraco.Web.UI/config/Dashboard.Release.config b/src/Umbraco.Web.UI/config/Dashboard.Release.config
index 47fb123d88..6e961a3972 100644
--- a/src/Umbraco.Web.UI/config/Dashboard.Release.config
+++ b/src/Umbraco.Web.UI/config/Dashboard.Release.config
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <dashBoard>
+
   <section alias="StartupSettingsDashboardSection">
     <areas>
       <area>settings</area>
@@ -34,6 +35,7 @@
         views/dashboard/media/mediafolderbrowser.html
       </control>
     </tab>
+
   </section>
 
   <section alias="StartupDashboardSection">
@@ -47,19 +49,12 @@
       <access>
         <grant>admin</grant>
       </access>
+
       <control showOnce="true" addPanel="true" panelCaption="">
         views/dashboard/default/startupdashboardintro.html
       </control>
-        <access>
-          <deny>editor</deny>
-          <deny>writer</deny>
-        </access>
-    </tab>
-    <tab caption="Change Password">
-      <control addPanel="true">
-        views/dashboard/changepassword.html
-      </control>
     </tab>
+
   </section>
 
   <section alias="StartupMemberDashboardSection">
diff --git a/src/Umbraco.Web.UI/config/Dashboard.config b/src/Umbraco.Web.UI/config/Dashboard.config
index dd4032e74a..6e961a3972 100644
--- a/src/Umbraco.Web.UI/config/Dashboard.config
+++ b/src/Umbraco.Web.UI/config/Dashboard.config
@@ -49,10 +49,10 @@
       <access>
         <grant>admin</grant>
       </access>
+
       <control showOnce="true" addPanel="true" panelCaption="">
         views/dashboard/default/startupdashboardintro.html
       </control>
-
     </tab>
 
   </section>