# Merge pull request \#14799 from ziglang/update-zig1 · gitcafe/zig

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

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

Visibility: public

Requested revision: ac1b0e832b4b9d151098050e1d29e28a568e215c

Requested commit: ac1b0e832b4b9d151098050e1d29e28a568e215c

Commit: ac1b0e832b4b9d151098050e1d29e28a568e215c

Tree: 755f438b1bb25a03f10469e5b87c30718aa17eed

Author: Andrew Kelley

Committer: GitHub

## Message

```
Merge pull request #14799 from ziglang/update-zig1

`@trap` fixups
```

## Parents

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

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

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