# fix merge conflict with identifiers matching primitives · gitcafe/zig

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

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

Visibility: public

Requested revision: 55be10486ef6aad1f497fb0ab85ac36043b79652

Requested commit: 55be10486ef6aad1f497fb0ab85ac36043b79652

Commit: 55be10486ef6aad1f497fb0ab85ac36043b79652

Tree: 9d2efe301dbfa14a43608a8adbc87d5027eb8e70

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

```
fix merge conflict with identifiers matching primitives

```

## Parents

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

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