notgull pushed a merge conflict, is he stupid?

Signed-off-by: John Nunley <[email protected]>
smol-rs · Nov 3, 2023 · f1fc4d0 · f1fc4d0
1 parent 5344aa9
commit f1fc4d0
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -39,13 +39,8 @@ waker-fn = "1.1.0"
 windows-sys = { version = "0.48.0", features = ["Win32_Foundation"] }
 
 [dev-dependencies]
-<<<<<<< HEAD
-async-channel = "2"
-async-net = "1"
-=======
 async-channel = "2.0.0"
 async-net = "2.0.0"
->>>>>>> faa5742 (Bump various dependencies)
 blocking = "1"
 criterion = { version = "0.4", default-features = false, features = ["cargo_bench_support"] }
 getrandom = "0.2.7"