mirror of
https://github.com/lnbits/lnbits-legend.git
synced 2025-02-24 14:51:05 +01:00
fix satspay merge error
This commit is contained in:
parent
59deca7b6f
commit
0a47b63597
1 changed files with 0 additions and 5 deletions
|
@ -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
|
||||
|
|
Loading…
Add table
Reference in a new issue