correct bad conflict resolution
authorjeff <jeff>
Mon, 30 Apr 2007 20:56:13 +0000 (20:56 +0000)
committerjeff <jeff>
Mon, 30 Apr 2007 20:56:13 +0000 (20:56 +0000)
commit65d5d1aef71cb068c02328aa45cf6db300e21b59
treea997b9abd7e9ccd9e0b99c700e17b34a40da189d
parent92fe5ff676ffb33595f8f5a07a96f221770e1c77
correct bad conflict resolution
httemplate/edit/cust_main/billing.html