fix satspay merge error

This commit is contained in:
dni ⚡ 2022-12-01 13:05:31 +01:00
parent 59deca7b6f
commit 0a47b63597

View file

@ -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