paritytech
diff --git a/‎Cargo.lock‎
Lines changed: 0 additions & 6 deletions b/‎Cargo.lock‎
Lines changed: 0 additions & 6 deletions
diff --git a/‎Cargo.toml‎
Lines changed: 0 additions & 4 deletions b/‎Cargo.toml‎
Lines changed: 0 additions & 4 deletions
@@ -899,11 +899,7 @@ linked-hash-map = { version = "0.5.4" }
 linked_hash_set = { version = "0.1.4" }
 linregress = { version = "0.5.1" }
 lite-json = { version = "0.2.0", default-features = false }
-<<<<<<< HEAD
-litep2p = { version = "0.10.0", features = ["websocket"] }
-=======
 litep2p = { version = "0.12.3", features = ["rsa", "websocket"] }
->>>>>>> a12ec9c2 (cargo: Update litep2p to v0.12.3 (#10665))
 log = { version = "0.4.22", default-features = false }
 macro_magic = { version = "0.5.1" }
 maplit = { version = "1.0.2" }