From 8ed280a029c397b572b961db7aa892e1ed726562 Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Fri, 25 Aug 2023 14:30:07 +0300
Subject: [PATCH] Rebase fixes

---
 Cargo.lock                 | 2 +-
 crates/rpc/proto/zed.proto | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d669be5d9d..8197f883c0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1220,7 +1220,7 @@ dependencies = [
  "tempfile",
  "text",
  "thiserror",
- "time 0.3.24",
+ "time 0.3.27",
  "tiny_http",
  "url",
  "util",
diff --git a/crates/rpc/proto/zed.proto b/crates/rpc/proto/zed.proto
index dbd700e264..ce47830af2 100644
--- a/crates/rpc/proto/zed.proto
+++ b/crates/rpc/proto/zed.proto
@@ -128,8 +128,8 @@ message Envelope {
 
         InlayHints inlay_hints = 116;
         InlayHintsResponse inlay_hints_response = 117;
-        ResolveInlayHint resolve_inlay_hint = 131;
-        ResolveInlayHintResponse resolve_inlay_hint_response = 132;
+        ResolveInlayHint resolve_inlay_hint = 137;
+        ResolveInlayHintResponse resolve_inlay_hint_response = 138;
         RefreshInlayHints refresh_inlay_hints = 118;
 
         CreateChannel create_channel = 119;