# Fix some merge errors · gitcafe/zed

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

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

Visibility: public

Requested revision: 9581279919413bd55a8ecc719d1baccf66c3e044

Requested commit: 9581279919413bd55a8ecc719d1baccf66c3e044

Commit: 9581279919413bd55a8ecc719d1baccf66c3e044

Tree: ed4f54283d3342c4c4aabf15cbb4ecb432d9510f

Author: Marshall Bowers

Committer: Marshall Bowers

## Message

```
Fix some merge errors

```

## Parents

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

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