From: jeff <jeff>
Date: Mon, 30 Apr 2007 20:56:13 +0000 (+0000)
Subject: correct bad conflict resolution
X-Git-Tag: freeside_1_7_3rc1~456
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=65d5d1aef71cb068c02328aa45cf6db300e21b59;p=freeside.git

correct bad conflict resolution
---

diff --git a/httemplate/edit/cust_main/billing.html b/httemplate/edit/cust_main/billing.html
index ad35a1e3f..d9e0ed0e4 100644
--- a/httemplate/edit/cust_main/billing.html
+++ b/httemplate/edit/cust_main/billing.html
@@ -205,7 +205,7 @@
 %
 %        qq!<TR><TD ALIGN="right" WIDTH="200">${r}Bank name </TD>!.
 %          qq!<TD COLSPAN="3" WIDTH="408"><INPUT TYPE="text" NAME="payname" VALUE="!. ( $payby =~ /^(CHEK|DCHK)$/ ? $cust_main->payname : '' ). qq!"></TD></TR>!.
-       ( $conf->exists('show_bankstate) ?
+%      ( $conf->exists('show_bankstate') ?
 %          qq!<TR><TD ALIGN="right" WIDTH="200">$paystate_label</TD>!.
 %          qq!<TD COLSPAN="3" WIDTH="408">!.
 %          include('select-state.html',
@@ -213,7 +213,7 @@
 %                    'state'   => $cust_main->paystate,
 %                    'country' => $cust_main->country,
 %                    'prefix' => 'pay',
-%                 ). "</TD></TR>".
+%                 ). "</TD></TR>"
 %         : '<INPUT TYPE="hidden" NAME="paystate" VALUE ="'.
 %            $cust_main->paystate. '">'
 %       ).