# Reapply \#27200 after bad conflict resolution \(\#27446\) · gitcafe/zed

[View on GitCafe](https://git.cafe/gitcafe/zed/commit/24d76a64c385b5e43ea71da9fe1ccf0261786050)

Repository: [gitcafe/zed](https://git.cafe/gitcafe/zed)

Visibility: public

Requested revision: 24d76a64c385b5e43ea71da9fe1ccf0261786050

Requested commit: 24d76a64c385b5e43ea71da9fe1ccf0261786050

Commit: 24d76a64c385b5e43ea71da9fe1ccf0261786050

Tree: b1f60d9094d2d06ee3d743da9545d9aeed6b3c1d

Author: Agus Zubiaga

Committer: GitHub

## Message

```
Reapply #27200 after bad conflict resolution (#27446)

Release Notes:

- N/A
```

## Parents

- [3ba624391f4ac89848d87e884e556931882105e4](https://git.cafe/gitcafe/zed/commit/3ba624391f4ac89848d87e884e556931882105e4?format=markdown)

[Source at this commit](https://git.cafe/gitcafe/zed/tree/24d76a64c385b5e43ea71da9fe1ccf0261786050?format=markdown)