# Sema: fix merge conflicts with previous commit · gitcafe/zig

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

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

Visibility: public

Requested revision: 8326ab7adb92aff11d19b21a6d42869a361b462b

Requested commit: 8326ab7adb92aff11d19b21a6d42869a361b462b

Commit: 8326ab7adb92aff11d19b21a6d42869a361b462b

Tree: a00d577d78d578feb6d5699ce15d09f31a21dffb

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

```
Sema: fix merge conflicts with previous commit

The previous commit and e8813b296bc55a13b534bd9b2a03e1f6af366915 had
merge conflicts which didn't get caught by git.

```

## Parents

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

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