# fix lock merge error · gitcafe/zed

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

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

Visibility: public

Requested revision: 2ff6ffff5873950607ae3fdffda30717832de31b

Requested commit: 2ff6ffff5873950607ae3fdffda30717832de31b

Commit: 2ff6ffff5873950607ae3fdffda30717832de31b

Tree: 841ad956fa251cbc6c8c7559158c1e303151ac82

Author: K Simmons

Committer: K Simmons

## Message

```
fix lock merge error

```

## Parents

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

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