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

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

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

Visibility: public

Requested revision: c1f404ad537ded5a584525f7f89dcf5705a2c405

Requested commit: c1f404ad537ded5a584525f7f89dcf5705a2c405

Commit: c1f404ad537ded5a584525f7f89dcf5705a2c405

Tree: b1f0bc587dc50fc3337535d4d239f64eb2a484bc

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

```
Compilation: fix merge conflict with previous commit

```

## Parents

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

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