From 77a407bfb80c6d17b7675a17ecabd4f2f145e731 Mon Sep 17 00:00:00 2001
From: iliana etaoin <iliana@oxide.computer>
Date: Thu, 14 Nov 2024 03:14:44 +0000
Subject: [PATCH] fix Cargo.lock merge

---
 Cargo.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.lock b/Cargo.lock
index d31531b977..7734323bf1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1382,7 +1382,7 @@ dependencies = [
  "camino",
  "clickhouse-admin-types",
  "clickward",
- "dropshot",
+ "dropshot 0.13.0",
  "omicron-workspace-hack",
 ]