mirror of
https://github.com/zed-industries/zed.git
synced 2026-11-21 16:10:19 +01:00
88d36d8b9f
Fixes a merge conflict between #16915 and #16039 Release Notes: - N/A