# x86_64: fix merge conflict · gitcafe/zig

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

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

Visibility: public

Requested revision: 06992e159b94a5d44f74f8e0a586b13fa7b0416e

Requested commit: 06992e159b94a5d44f74f8e0a586b13fa7b0416e

Commit: 06992e159b94a5d44f74f8e0a586b13fa7b0416e

Tree: bb74ce588f6ac2d601941bb37a7b6259f2e24ffd

Author: Jacob Young

Committer: mlugg

## Message

```
x86_64: fix merge conflict

```

## Parents

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

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