diff options
| author | Christopher Burger <burgerc@freeside.biz> | 2018-01-12 16:52:28 -0500 |
|---|---|---|
| committer | Christopher Burger <burgerc@freeside.biz> | 2018-01-14 12:01:29 -0500 |
| commit | d153ff01787dbc84e5a6fc256ba42ee15ff0d816 (patch) | |
| tree | d70c90eed104a65432e71755672a03b3a347fe92 /httemplate/pref/pref.html | |
| parent | fe8c3092f0c4210049de3a9673f70e8f4bb541be (diff) | |
RT# 78617 - updated redirect to freeside_status to show update message
Conflicts:
httemplate/pref/pref-process.html
httemplate/pref/pref.html
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 %> |