Skip to content

Commit

Permalink
MINOR Fixed merge error
Browse files Browse the repository at this point in the history
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@102478 467b73ca-7a2a-4603-9d3b-597d59a354a9
  • Loading branch information
chillu committed Apr 12, 2010
1 parent 6c0caee commit ce9d927
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion code/SecurityAdmin.php
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -357,7 +357,6 @@ function providePermissions() {
'help' => _t('SecurityAdmin.APPLY_ROLES_HELP', 'Ability to edit the roles assigned to a group. Requires "Access to Security.".'), 'help' => _t('SecurityAdmin.APPLY_ROLES_HELP', 'Ability to edit the roles assigned to a group. Requires "Access to Security.".'),
'sort' => 0 'sort' => 0
) )
'APPLY_ROLES' => _t('SecurityAdmin.APPLY_ROLES', 'Apply roles to groups'),
); );
} }


Expand Down

0 comments on commit ce9d927

Please sign in to comment.