# fix regression from incorrect conflict resolution in prev commit · gitcafe/zig

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

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

Visibility: public

Requested revision: 2b698888ce6cd78e74258990b7519c9689c9d345

Requested commit: 2b698888ce6cd78e74258990b7519c9689c9d345

Commit: 2b698888ce6cd78e74258990b7519c9689c9d345

Tree: b4abb2abb9fe344c24608bcd6564f05884d72bd4

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

```
fix regression from incorrect conflict resolution in prev commit

thanks for catching this LemonBoy

```

## Parents

- [187a6d198fd06dfedbb121aa5a79791b34b24794](https://git.cafe/gitcafe/zig/commit/187a6d198fd06dfedbb121aa5a79791b34b24794?format=markdown)

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