From 73cf641a40433e3cda671d99e71e3ce4374d3c79 Mon Sep 17 00:00:00 2001
From: clabby <ben@clab.by>
Date: Thu, 1 Dec 2022 21:54:35 -0500
Subject: [PATCH] Resolve conflicts

---
 Cargo.lock | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Cargo.lock b/Cargo.lock
index b7d1d2c31f0e..6359418e73cc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1638,6 +1638,12 @@ dependencies = [
  "cfg-if 1.0.0",
 ]
 
+[[package]]
+name = "endian-type"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
+
 [[package]]
 name = "enr"
 version = "0.7.0"