# Fixed conflicts · gitcafe/zed

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

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

Visibility: public

Requested revision: 67e650b0e00a5e6b5fd8f8911a416eddbaccf1f7

Requested commit: 67e650b0e00a5e6b5fd8f8911a416eddbaccf1f7

Commit: 67e650b0e00a5e6b5fd8f8911a416eddbaccf1f7

Tree: 3140a5b07f41c47266bf9cff816ab86f2b5f92c4

Author: Mikayla Maki

Committer: Mikayla Maki

## Message

```
Fixed conflicts

```

## Parents

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

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