# stage2: fix compile error merge conflict · gitcafe/zig

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

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

Visibility: public

Requested revision: 17596c79a9239edec533a041f9a4da3a7af0d980

Requested commit: 17596c79a9239edec533a041f9a4da3a7af0d980

Commit: 17596c79a9239edec533a041f9a4da3a7af0d980

Tree: 59e34ecfddb68d55627a2bb1faf50e9af3e7f9ea

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

```
stage2: fix compile error merge conflict

3250b20ceabea044bd4c7b1653d76d7069840058 had a silent merge conflict
with master branch; fixed now.

```

## Parents

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

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