# Fix stray merge failure · gitcafe/zed

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

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

Visibility: public

Requested revision: 56b416202386c80fa91f3fa159ed32cd7bc3fa32

Requested commit: 56b416202386c80fa91f3fa159ed32cd7bc3fa32

Commit: 56b416202386c80fa91f3fa159ed32cd7bc3fa32

Tree: 4e774875832bab3d0a004354559119e8abd9fcec

Author: Mikayla Maki

Committer: Mikayla Maki

## Message

```
Fix stray merge failure

```

## Parents

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

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