[freeside-commits] freeside/httemplate/edit/cust_main billing.html, 1.14.2.3, 1.14.2.4

[Jeff Finucane,420,,]

Update of /home/cvs/cvsroot/freeside/httemplate/edit/cust_main
In directory wavetail:/tmp/cvs-serv26585

Modified Files:
      Tag: FREESIDE_1_7_BRANCH
	billing.html 
Log Message:
correct bad conflict resolution

Index: billing.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/edit/cust_main/billing.html,v
retrieving revision 1.14.2.3
retrieving revision 1.14.2.4
diff -u -d -r1.14.2.3 -r1.14.2.4
--- billing.html	29 Apr 2007 23:30:53 -0000	1.14.2.3
+++ billing.html	30 Apr 2007 20:56:13 -0000	1.14.2.4
@@ -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. '">'
 %       ).