From 0a47b635976b1063e781b1448c6b9f2ff1130d1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?dni=20=E2=9A=A1?= <office@dnilabs.com>
Date: Thu, 1 Dec 2022 13:05:31 +0100
Subject: [PATCH] fix satspay merge error

---
 lnbits/extensions/satspay/models.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/lnbits/extensions/satspay/models.py b/lnbits/extensions/satspay/models.py
index 4d30f915..0b2b1473 100644
--- a/lnbits/extensions/satspay/models.py
+++ b/lnbits/extensions/satspay/models.py
@@ -42,13 +42,8 @@ class Charges(BaseModel):
     webhook: Optional[str]
     completelink: Optional[str]
     completelinktext: Optional[str] = "Back to Merchant"
-<<<<<<< HEAD
-    extra: str = "{}"
-    custom_css: Optional[str]
-=======
     custom_css: Optional[str]
     extra: str = DEFAULT_MEMPOOL_CONFIG
->>>>>>> main
     time: int
     amount: int
     balance: int