Skip to content

Commit

Permalink
fix merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
riccardobl committed Jan 6, 2025
2 parents faace30 + 5a4d50a commit 5ffa992
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion pages/settings/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ export default function Settings ({ ssrData }) {
proxyReceive: settings?.proxyReceive,
directReceive: settings?.directReceive,
signerType: settings?.signerType || 'nip07',
signer: settings?.signer
signer: settings?.signer,
receiveCreditsBelowSats: settings?.receiveCreditsBelowSats,
sendCreditsBelowSats: settings?.sendCreditsBelowSats
}}
Expand Down

0 comments on commit 5ffa992

Please sign in to comment.