Skip to content

Commit 832d071

Browse files
committed
fix poor merge conflict resolve
1 parent aed6dcf commit 832d071

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

Cargo-recent.lock

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2583,7 +2583,6 @@ dependencies = [
25832583
"tempfile",
25842584
"tokio",
25852585
"tokio-rustls",
2586-
<<<<<<< HEAD
25872586
"tracing",
25882587
"tracing-subscriber",
25892588
"toml",

0 commit comments

Comments
 (0)