From 9645e8502d9f071d8359c475fa127be4c96fb2e3 Mon Sep 17 00:00:00 2001
From: John Lapeyre <jlapeyre@users.noreply.github.com>
Date: Wed, 10 Jan 2024 19:43:52 -0500
Subject: [PATCH] More conflicts

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

diff --git a/Cargo.lock b/Cargo.lock
index baa3a1160621..6ac342e48f0f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1214,3 +1214,14 @@ name = "yansi"
 version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec"
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.7.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]