RT# 78617 - updated redirect to freeside_status to show update message

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

diff --git a/httemplate/pref/pref.html b/httemplate/pref/pref.html
index c7c7c9d..c504b2c 100644 (file)
--- 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 %>