RT# 31208 Docs $FS::Record::qsearch_qualify_columns

[freeside.git] / httemplate / pref / pref.html

diff --git a/httemplate/pref/pref.html b/httemplate/pref/pref.html
index c7c7c9d..29aeb4c 100644 (file)
--- a/httemplate/pref/pref.html
+++ b/httemplate/pref/pref.html
@@ -6,11 +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 %>
 <% ntable("#cccccc",2) %>
@@ -182,7 +177,7 @@ Email Address
 <% ntable("#cccccc",2) %>
 
   <TR>
-    <TH>Email Address(es) (comma separated) </TH>
+    <TH><% emt("Email Address(es) (comma separated) ") %></TH>
     <TD>
    <TD><INPUT TYPE="text" NAME="email_address" VALUE="<% $email_address %>">
     </TD>