# Fixed conflict · gitcafe/zed

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

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

Visibility: public

Requested revision: 889720d06d33cef3b1cc66141fc412cd40a332be

Requested commit: 889720d06d33cef3b1cc66141fc412cd40a332be

Commit: 889720d06d33cef3b1cc66141fc412cd40a332be

Tree: 29832a76296ad89431a2f99078b4391f642128bc

Author: Mikayla Maki

Committer: Mikayla Maki

## Message

```
Fixed conflict

```

## Parents

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

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