fix: merge conflicts

commerceblock · Aug 22, 2024 · 703a583 · 703a583
2 parents c96e690 + b7cc762
commit 703a583
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/clients/libs/web/lightning-latch.js b/clients/libs/web/lightning-latch.js
@@ -132,4 +132,4 @@ const getPaymentHash = async (clientConfig, batchId) => {
 
 }
 
-export default { createPreImage, confirmPendingInvoice, retrievePreImage, getPaymentHash};
+export default { createPreImage, confirmPendingInvoice, retrievePreImage, getPaymentHash };
diff --git a/wasm/Cargo.toml b/wasm/Cargo.toml
@@ -46,4 +46,5 @@ wasm-bindgen-test = "0.3.34"
 opt-level = "s"
 
 [dependencies.getrandom]
+version = "0.2.10"
 features = ["js"]
diff --git a/wasm/rust-toolchain.toml b/wasm/rust-toolchain.toml
@@ -0,0 +1,2 @@
+[toolchain]
+channel = "1.76.0"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -132,4 +132,4 @@ const getPaymentHash = async (clientConfig, batchId) => {

		}

		export default { createPreImage, confirmPendingInvoice, retrievePreImage, getPaymentHash};
		export default { createPreImage, confirmPendingInvoice, retrievePreImage, getPaymentHash };