# Fix broken merge · gitcafe/zed

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

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

Visibility: public

Requested revision: 97203e1e02fdf3c25d5ffd037d495947a74ac6d5

Requested commit: 97203e1e02fdf3c25d5ffd037d495947a74ac6d5

Commit: 97203e1e02fdf3c25d5ffd037d495947a74ac6d5

Tree: 3105d8bd69b0ab1e99b298ab8b2f8d63d9a027ff

Author: Mikayla Maki

Committer: Mikayla Maki

## Message

```
Fix broken merge

```

## Parents

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

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