# Sema: fix merge conflict regarding identifiers matching primitives · gitcafe/zig

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

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

Visibility: public

Requested revision: fb7ca1ad48c58ebc40493cc085663956010ec58b

Requested commit: fb7ca1ad48c58ebc40493cc085663956010ec58b

Commit: fb7ca1ad48c58ebc40493cc085663956010ec58b

Tree: d3e606c9f3504cca6dfd5e3a9a8c170534010d08

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

```
Sema: fix merge conflict regarding identifiers matching primitives

```

## Parents

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

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