From 57da68d563c29892608a9b0094a82bd0bdca0195 Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Mon, 5 Apr 2021 13:36:14 -0700
Subject: [PATCH] Update Cargo.toml

---
 net-utils/Cargo.toml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/net-utils/Cargo.toml b/net-utils/Cargo.toml
index 0aca1b0af6..41bcba67ae 100644
--- a/net-utils/Cargo.toml
+++ b/net-utils/Cargo.toml
@@ -18,17 +18,10 @@ rand = "0.7.0"
 serde = "1.0.122"
 serde_derive = "1.0.103"
 socket2 = "0.3.17"
-<<<<<<< HEAD
 solana-clap-utils = { path = "../clap-utils", version = "=1.6.5" }
 solana-logger = { path = "../logger", version = "=1.6.5" }
 solana-version = { path = "../version", version = "=1.6.5" }
-tokio = { version = "1.1", features = ["full"] }
-=======
-solana-clap-utils = { path = "../clap-utils", version = "=1.7.0" }
-solana-logger = { path = "../logger", version = "=1.7.0" }
-solana-version = { path = "../version", version = "=1.7.0" }
 tokio = { version = "1", features = ["full"] }
->>>>>>> 43feef736... Adjust tokio version to just "1"
 url = "2.1.1"
 
 [lib]