summaryrefslogtreecommitdiff
path: root/httemplate
diff options
context:
space:
mode:
authorMark Wells <mark@freeside.biz>2015-11-18 00:09:29 -0800
committerMark Wells <mark@freeside.biz>2015-11-18 00:09:29 -0800
commit1daa37e733b9e972e5328503374130a423d02836 (patch)
treec2afe34c86bc700e9790b8ce3812e65a75b76673 /httemplate
parent55d10bb32d65dfe4850cd5eaec2cc8c2ead17171 (diff)
parent46762f49fe399c99d2a42a9f7974ca059852fc75 (diff)
Merge branch 'master' of git.freeside.biz:/home/git/freeside
Diffstat (limited to 'httemplate')
-rw-r--r--httemplate/misc/reason-merge.html4
1 files changed, 1 insertions, 3 deletions
diff --git a/httemplate/misc/reason-merge.html b/httemplate/misc/reason-merge.html
index a531e582c..14f5ebb84 100644
--- a/httemplate/misc/reason-merge.html
+++ b/httemplate/misc/reason-merge.html
@@ -1,9 +1,7 @@
% if ($success) {
<% include('/elements/header-popup.html', 'Reason Merge Success') %>
<SCRIPT>
-<!--
window.top.location.reload()
--->
</SCRIPT>
% } else {
<% include('/elements/header-popup.html', 'Merge Reasons') %>
@@ -72,7 +70,7 @@ if ($cgi->param('process_merge') && !$error) {
$error = $destreason->merge(\@reasons);
$success = 1 unless $error;
} else {
- $error = "No desitation reason selected.";
+ $error = "No destination reason selected.";
}
}