diff options
Diffstat (limited to 'httemplate/pref/pref.html')
| -rw-r--r-- | httemplate/pref/pref.html | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/httemplate/pref/pref.html b/httemplate/pref/pref.html index c7c7c9d60..c504b2c5e 100644 --- a/httemplate/pref/pref.html +++ b/httemplate/pref/pref.html @@ -6,10 +6,6 @@ <% include('/elements/error.html') %> -<<<<<<< HEAD -======= -<& /elements/alert.html &> - % if ( FS::Auth->auth_class->can('change_password') ) { <% mt('Change password (leave blank for no change)') |h %> |