# Merge branch 'main' into cursors · gitcafe/zed

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

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

Visibility: public

Requested revision: bfee008bb2ecc2867e44132afe03bafdaf1ae1df

Requested commit: bfee008bb2ecc2867e44132afe03bafdaf1ae1df

Commit: bfee008bb2ecc2867e44132afe03bafdaf1ae1df

Tree: a35e07f59ea7d38c26b5ec99f7c72ef47c35cea9

Author: Conrad Irwin

Committer: Conrad Irwin

## Message

```
Merge branch 'main' into cursors

```

## Parents

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

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

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