3 files changed, 3 insertions, 8 deletions
diff --git a/src/routes/send/[...text]/+page.server.js b/src/routes/send/[...text]/+page.server.js
index c93287ed..471724e4 100644
--- a/src/routes/send/[...text]/+page.server.js
+++ b/src/routes/send/[...text]/+page.server.js
@@ -48,13 +48,8 @@ let parse = async (t) => {
 };
 
 export async function load({ params }) {
-<<<<<<< HEAD
-  let { text } = params;
-  await parse(text);
-=======
 	let { text } = params;
 	await parse(text);
->>>>>>> master
 }
 
 export const actions = {
diff --git a/src/routes/send/bitcoin/[address]/+page.svelte b/src/routes/send/bitcoin/[address]/+page.svelte
index 28bfeb54..8c9e72ff 100644
--- a/src/routes/send/bitcoin/[address]/+page.svelte
+++ b/src/routes/send/bitcoin/[address]/+page.svelte
@@ -8,7 +8,7 @@
 	let { address } = $page.params;
 	let { currency } = data.user;
 	let amount, loading;
-	
+
 	let submit = () => (loading = true);
 </script>
 
@@ -23,7 +23,7 @@
 	</div>
 	<Numpad bind:amount {currency} />
 
-  <form method="POST" use:enhance on:submit={submit}>
+	<form method="POST" use:enhance on:submit={submit}>
 		<input name="address" value={address} type="hidden" />
 		<input name="amount" value={amount} type="hidden" />
 		<div class="flex w-full">
diff --git a/src/routes/send/user/[username]/+page.svelte b/src/routes/send/user/[username]/+page.svelte
index 05908011..ed6a9f17 100644
--- a/src/routes/send/user/[username]/+page.svelte
+++ b/src/routes/send/user/[username]/+page.svelte
@@ -53,7 +53,7 @@
 		<Numpad bind:amount={a} bind:amountFiat={af} {currency} bind:fiat />
 	{/if}
 
-  <form method="POST" use:enhance on:submit={submit}>
+	<form method="POST" use:enhance on:submit={submit}>
 		<input name="amount" value={amount} type="hidden" />
 		<input name="username" value={recipient.username} type="hidden" />
 		<input name="confirmed" value={form?.confirm} type="hidden" />