# windows: Fix semantic merge conflict with \`ShellKind::new\` \(\#40107\) · gitcafe/zed

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

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

Visibility: public

Requested revision: dac5725246bf3753787bd31e854f3e2a52a2dd31

Requested commit: dac5725246bf3753787bd31e854f3e2a52a2dd31

Commit: dac5725246bf3753787bd31e854f3e2a52a2dd31

Tree: 0a014641c4bd59e58b7e29bedb820a163839563b

Author: Cole Miller

Committer: GitHub

## Message

```
windows: Fix semantic merge conflict with `ShellKind::new` (#40107)

Release Notes:

- N/A
```

## Parents

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

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