highperfocused/lnbits
1
0
Fork 0
mirror of https://github.com/lnbits/lnbits.git synced 2025-06-25 16:20:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix satspay merge error

Browse Source
This commit is contained in:
dni ⚡ 2022-12-01 13:05:31 +01:00
parent 59deca7b6f
commit 0a47b63597
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lnbits/extensions/satspay/models.py
View File

@ -42,13 +42,8 @@ class Charges(BaseModel):
webhook: Optional[str] webhook: Optional[str]
completelink: Optional[str] completelink: Optional[str]
completelinktext: Optional[str] = "Back to Merchant" completelinktext: Optional[str] = "Back to Merchant"
<<<<<<< HEAD
extra: str = "{}"
custom_css: Optional[str]
=======
custom_css: Optional[str] custom_css: Optional[str]
extra: str = DEFAULT_MEMPOOL_CONFIG extra: str = DEFAULT_MEMPOOL_CONFIG
>>>>>>> main
time: int time: int
amount: int amount: int
balance: int balance: int