correct bad conflict resolution
authorjeff <jeff>
Sun, 27 Aug 2006 19:30:38 +0000 (19:30 +0000)
committerjeff <jeff>
Sun, 27 Aug 2006 19:30:38 +0000 (19:30 +0000)
commit4142ac8edaafd2791cd89116e2a6883f0be99366
tree861a91c14f19c8811d99fca1f6db4932348f286b
parent6af1b1bfa25e5ececef5e0dcd38b55917121cee2
correct bad conflict resolution
httemplate/edit/cust_bill_pay.cgi
httemplate/edit/cust_credit.cgi
httemplate/edit/cust_credit_bill.cgi
httemplate/misc/download-batch.cgi