# Fix post-merge compile errors · gitcafe/zed

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

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

Visibility: public

Requested revision: 2079cd641e9ebf9c73e2aaefd4bec246712e33eb

Requested commit: 2079cd641e9ebf9c73e2aaefd4bec246712e33eb

Commit: 2079cd641e9ebf9c73e2aaefd4bec246712e33eb

Tree: 444b475e704e1266bcf34bb66ecac53af92cf965

Author: Nathan Sobo

Committer: Nathan Sobo

## Message

```
Fix post-merge compile errors

```

## Parents

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

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