# Merge remote-tracking branch 'origin/main' into pr/47911 · gitcafe/zed

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

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

Visibility: public

Requested revision: 4ee570110d64d594b2e5bec8e6a730c09e2b3add

Requested commit: 4ee570110d64d594b2e5bec8e6a730c09e2b3add

Commit: 4ee570110d64d594b2e5bec8e6a730c09e2b3add

Tree: c172cba1a018025e6d6ac4fac2336f1611b7a82c

Author: Danilo Leal

Committer: Danilo Leal

## Message

```
Merge remote-tracking branch 'origin/main' into pr/47911

# Conflicts:
#	crates/edit_prediction_types/src/edit_prediction_types.rs
#	crates/editor/src/edit_prediction_tests.rs

```

## Parents

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

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

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