# Properly fixed merge issues · gitcafe/zed

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

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

Visibility: public

Requested revision: 4a860d4da42c6ff75044772318870bd68af0661c

Requested commit: 4a860d4da42c6ff75044772318870bd68af0661c

Commit: 4a860d4da42c6ff75044772318870bd68af0661c

Tree: 2521d273776e6264f546d5c824cf5abd17a83bb5

Author: Mikayla Maki

Committer: Mikayla Maki

## Message

```
Properly fixed merge issues

```

## Parents

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

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