# fix merge error to use new default settings flow · gitcafe/zed

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

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

Visibility: public

Requested revision: e7b1060bca7c7478f27061ee0a65e16cfb923bca

Requested commit: e7b1060bca7c7478f27061ee0a65e16cfb923bca

Commit: e7b1060bca7c7478f27061ee0a65e16cfb923bca

Tree: e659c00fd51fe9f510928a3007e68bef296ed970

Author: K Simmons

Committer: K Simmons

## Message

```
fix merge error to use new default settings flow

```

## Parents

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

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