# compiler: merge conflicts and typos · gitcafe/zig

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

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

Visibility: public

Requested revision: 9c3324173de2d8de80e95fb6be23eb63dfbc5169

Requested commit: 9c3324173de2d8de80e95fb6be23eb63dfbc5169

Commit: 9c3324173de2d8de80e95fb6be23eb63dfbc5169

Tree: ba2d5666174670795280879f64ccfabf024429be

Author: mlugg

Committer: Jacob Young

## Message

```
compiler: merge conflicts and typos

```

## Parents

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

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