Rebase fixes

Kirill Bulatov created 2 years ago

Change summary

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

Detailed changes

Cargo.lock

@@ -1220,7 +1220,7 @@ dependencies = [
  "tempfile",
  "text",
  "thiserror",
- "time 0.3.24",
+ "time 0.3.27",
  "tiny_http",
  "url",
  "util",

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;