Fixes: Weird merge issue with dashboard.config

This commit is contained in:
perploug
2014-03-07 10:18:30 +01:00
parent 46461c7c5d
commit 3b4487c836
2 changed files with 5 additions and 10 deletions

View File

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

View File

@@ -49,10 +49,10 @@
<access>
<grant>admin</grant>
</access>
<control showOnce="true" addPanel="true" panelCaption="">
views/dashboard/default/startupdashboardintro.html
</control>
</tab>
</section>