fix merge error

DougAnderson444 · Aug 17, 2023 · da71eb3 · da71eb3
1 parent 2e8c2e5
commit da71eb3
Show file tree

Hide file tree

Showing 2 changed files with 99 additions and 18 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/interop-tests/Cargo.toml b/interop-tests/Cargo.toml
@@ -33,6 +33,7 @@ libp2p = { path = "../libp2p", features = [
     "websocket",
     "yamux",
 ] }
+libp2p-mplex = { path = "../muxers/mplex" }
 libp2p-webrtc = { workspace = true, features = ["tokio"] }
 mime_guess = "2.0"
 redis = { version = "0.23.0", default-features = false, features = [