# fix some warnings and merge errors · gitcafe/zed

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

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

Visibility: public

Requested revision: f90b693ed52c54d24598d760398c2710422a418c

Requested commit: f90b693ed52c54d24598d760398c2710422a418c

Commit: f90b693ed52c54d24598d760398c2710422a418c

Tree: 949c7d55b5a3d0cd071801d583445e8fa1dc457b

Author: K Simmons

Committer: K Simmons

## Message

```
fix some warnings and merge errors

```

## Parents

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

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