# Fixing merge conflicts · gitcafe/zed

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

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

Visibility: public

Requested revision: 5a1797cb21c792856a39e9c510c0beadb4984938

Requested commit: 5a1797cb21c792856a39e9c510c0beadb4984938

Commit: 5a1797cb21c792856a39e9c510c0beadb4984938

Tree: f1b3db15f17ca570378921305fcc5983e3c95963

Author: Mikayla Maki

Committer: Mikayla Maki

## Message

```
Fixing merge conflicts

```

## Parents

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

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

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