diff options
| author | jeff <jeff> | 2007-04-30 20:56:13 +0000 |
|---|---|---|
| committer | jeff <jeff> | 2007-04-30 20:56:13 +0000 |
| commit | 65d5d1aef71cb068c02328aa45cf6db300e21b59 (patch) | |
| tree | a997b9abd7e9ccd9e0b99c700e17b34a40da189d | |
| parent | 92fe5ff676ffb33595f8f5a07a96f221770e1c77 (diff) | |
correct bad conflict resolution
| -rw-r--r-- | httemplate/edit/cust_main/billing.html | 4 |
1 files changed, 2 insertions, 2 deletions
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. '">' % ). |