search

zed-industries / zed

Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
https://zed.dev
Other
50.45k stars 3.12k forks source link

Follow-up on #18447: Unintentional deletion during merge-conflicts resolution #20991

Closed JunkuiZhang closed 9 hours ago

JunkuiZhang commented 17 hours ago

After #18447 was merged, I reviewed the PR code as usual. During this review, I realized that some code was unintentionally removed when I was resolving merge conflicts in #18447.

Sorry!

Release Notes:

mikayla-maki commented 17 hours ago

Thanks for the quick catch!