# stage2: fix merge conflict with previous commit · gitcafe/zig

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

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

Visibility: public

Requested revision: fcd25065ef41ac93e10031ebea0ed2bc0effce17

Requested commit: fcd25065ef41ac93e10031ebea0ed2bc0effce17

Commit: fcd25065ef41ac93e10031ebea0ed2bc0effce17

Tree: 5f86c4580f3f5f858ce0ad451359b26ec6cb0bdf

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

```
stage2: fix merge conflict with previous commit

The compiler failed to build from source; this fixes it.

```

## Parents

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

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