diff --git a/src/routes/console/organization-[organization]/billing/paymentHistory.svelte b/src/routes/console/organization-[organization]/billing/paymentHistory.svelte index 1e0ea184c..19f9bc76b 100644 --- a/src/routes/console/organization-[organization]/billing/paymentHistory.svelte +++ b/src/routes/console/organization-[organization]/billing/paymentHistory.svelte @@ -72,11 +72,7 @@ payments.

-<<<<<<< HEAD - {#if invoiceList?.invoices?.length > 0} -======= {#if invoiceList.total > 0} ->>>>>>> 69c4c7facb803504e1ff2cdf1afd835e56190157 Due Date @@ -87,20 +83,10 @@ {#each invoiceList?.invoices as invoice, i} {@const status = invoice.status} -<<<<<<< HEAD - {toLocaleDate(invoice.dueAt)} - -======= - - - {toLocaleDate(invoice.dueAt)} - - ->>>>>>> 69c4c7facb803504e1ff2cdf1afd835e56190157 {#if invoice?.lastError}