# Compilation: fix rebase conflict · gitcafe/zig

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

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

Visibility: public

Requested revision: 67e3e4989d5dc654ce5fef87d5a974caa05b9733

Requested commit: 67e3e4989d5dc654ce5fef87d5a974caa05b9733

Commit: 67e3e4989d5dc654ce5fef87d5a974caa05b9733

Tree: 500cb70cb5b69bea25ae3a3f378feb99a96edc11

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

```
Compilation: fix rebase conflict

```

## Parents

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

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