From a49fd81523eaa78ea353d70ba495c869939e6433 Mon Sep 17 00:00:00 2001
From: Jonathan Kelley <jkelleyrtp@gmail.com>
Date: Thu, 20 Jul 2023 10:55:52 -0700
Subject: [PATCH] fix merge conflict

---
 packages/router/Cargo.toml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/router/Cargo.toml b/packages/router/Cargo.toml
index a23e87d2c..ccd14dd28 100644
--- a/packages/router/Cargo.toml
+++ b/packages/router/Cargo.toml
@@ -18,10 +18,11 @@ thiserror = { workspace = true }
 futures-util = { workspace = true }
 serde_urlencoded = { version = "0.7.1", optional = true }
 serde = { version = "1", features = ["derive"], optional = true }
-thiserror = "1.0.37"
 url = "2.3.1"
 wasm-bindgen = { workspace = true, optional = true }
-web-sys = { version = "0.3.60", optional = true, features = ["ScrollRestoration"] }
+web-sys = { version = "0.3.60", optional = true, features = [
+    "ScrollRestoration",
+] }
 js-sys = { version = "0.3.63", optional = true }
 gloo-utils = { version = "0.1.6", optional = true }
 dioxus-ssr = { workspace = true, optional = true }