From 411c8e301b59f1520ffbe25c4413cbe8d96d8e43 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Fri, 5 Jul 2024 11:15:17 +0200 Subject: [PATCH] fix: git merge leftovers --- .../billing/paymentHistory.svelte | 14 -------------- 1 file changed, 14 deletions(-) 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}