From d153ff01787dbc84e5a6fc256ba42ee15ff0d816 Mon Sep 17 00:00:00 2001
From: Christopher Burger <burgerc@freeside.biz>
Date: Fri, 12 Jan 2018 16:52:28 -0500
Subject: [PATCH] RT# 78617 - updated redirect to freeside_status to show
 update message

Conflicts:
	httemplate/pref/pref-process.html
	httemplate/pref/pref.html
---
 httemplate/elements/alert.html    | 4 ----
 httemplate/pref/pref-process.html | 3 +--
 httemplate/pref/pref.html         | 4 ----
 3 files changed, 1 insertion(+), 10 deletions(-)
 delete mode 100644 httemplate/elements/alert.html

diff --git a/httemplate/elements/alert.html b/httemplate/elements/alert.html
deleted file mode 100644
index 620588b0c..000000000
--- a/httemplate/elements/alert.html
+++ /dev/null
@@ -1,4 +0,0 @@
-% if ( $cgi->param('alert') ) { 
-  <FONT SIZE="+1" COLOR="#008000"><% mt($cgi->param('alert')) |h %></FONT>
-  <BR><BR>
-% } 
\ No newline at end of file
diff --git a/httemplate/pref/pref-process.html b/httemplate/pref/pref-process.html
index cf0d8240f..122e92f7e 100644
--- a/httemplate/pref/pref-process.html
+++ b/httemplate/pref/pref-process.html
@@ -1,10 +1,9 @@
 % if ( $error ) {
 %   $cgi->param('error', $error);
-<% $cgi->redirect(popurl(1). "pref.html?". $cgi->query_string ) %>
+    <% $cgi->redirect(popurl(1). "pref.html?". $cgi->query_string ) %>
 % } else {
 <% include('/elements/header.html', 'Preferences updated') %>
 <% include('/elements/footer.html') %>
-<% $cgi->redirect(popurl(1). "pref.html?alert=Preferences updated" ) %>
 % }
 <%init>
 
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 %>
-- 
2.11.0