From 42c0e9474ecfa743a01a7ce4e23c3201e424667a Mon Sep 17 00:00:00 2001
From: Jun Kurihara <junkurihara@users.noreply.github.com>
Date: Thu, 13 Oct 2022 18:12:22 +0900
Subject: [PATCH] deps

---
 Cargo.toml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 4dfc8cc..be24326 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -18,11 +18,7 @@ http3 = ["quinn", "h3", "h3-quinn"]
 [dependencies]
 env_logger = "0.9.1"
 anyhow = "1.0.65"
-<<<<<<< HEAD
-clap = { version = "4.0.13", features = ["std", "cargo", "wrap_help"] }
-=======
 clap = { version = "4.0.14", features = ["std", "cargo", "wrap_help"] }
->>>>>>> main
 futures = { version = "0.3.24", features = ["alloc", "async-await"] }
 hyper = { version = "0.14.20", default-features = false, features = [
   "server",