From 3f217b930aa9cb662f5b0437973d66632f16d710 Mon Sep 17 00:00:00 2001
From: Bryan Stitt <bryan@llamanodes.com>
Date: Mon, 20 Feb 2023 14:29:23 -0800
Subject: [PATCH] cargo upgrade

---
 web3_proxy/Cargo.toml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/web3_proxy/Cargo.toml b/web3_proxy/Cargo.toml
index 6446ec7b..41184e26 100644
--- a/web3_proxy/Cargo.toml
+++ b/web3_proxy/Cargo.toml
@@ -27,7 +27,11 @@ thread-fast-rng = { path = "../thread-fast-rng" }
 
 anyhow = { version = "1.0.69", features = ["backtrace"] }
 argh = "0.1.10"
+<<<<<<< HEAD
 axum = { version = "0.6.8", features = ["headers", "ws"] }
+=======
+axum = { version = "0.6.7", features = ["headers", "ws"] }
+>>>>>>> 698d53d (cargo upgrade)
 axum-client-ip = "0.4.0"
 axum-macros = "0.3.4"
 chrono = "0.4.23"
@@ -69,7 +73,11 @@ serde = { version = "1.0.152", features = [] }
 serde_json = { version = "1.0.93", default-features = false, features = ["alloc", "raw_value"] }
 serde_prometheus = "0.2.1"
 siwe = "0.5.0"
+<<<<<<< HEAD
 time = "0.3.20"
+=======
+time = "0.3.19"
+>>>>>>> 698d53d (cargo upgrade)
 tokio = { version = "1.25.0", features = ["full"] }
 tokio-stream = { version = "0.1.12", features = ["sync"] }
 tokio-uring = { version = "0.4.0", optional = true }