# fix merge conflicr · gitcafe/zed

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

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

Visibility: public

Requested revision: be94f614a701ad24ebeb5726b0561b0834edaf04

Requested commit: be94f614a701ad24ebeb5726b0561b0834edaf04

Commit: be94f614a701ad24ebeb5726b0561b0834edaf04

Tree: f7f65417937acdeb289fb9d0cba93c381e419cba

Author: Mikayla Maki

Committer: Mikayla Maki

## Message

```
fix merge conflicr

```

## Parents

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

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

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