# Fix merge · gitcafe/zed

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

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

Visibility: public

Requested revision: f8368737641c878c14b3020f6cb2933a13f6a49f

Requested commit: f8368737641c878c14b3020f6cb2933a13f6a49f

Commit: f8368737641c878c14b3020f6cb2933a13f6a49f

Tree: 5684f2bc8c6dfdb9a9eea126c494f19d6854e2a3

Author: Nathan Sobo

Committer: Nathan Sobo

## Message

```
Fix merge

```

## Parents

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

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