# fixed merge errors · gitcafe/zed

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

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

Visibility: public

Requested revision: ab9f07344399f70e4079644d9876536472178795

Requested commit: ab9f07344399f70e4079644d9876536472178795

Commit: ab9f07344399f70e4079644d9876536472178795

Tree: 66f6cedc3153aba967fb1a2589cd5cc63cd45c68

Author: K Simmons

Committer: K Simmons

## Message

```
fixed merge errors

```

## Parents

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

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