# std.Ast.Render: fix conflicts with master branch · gitcafe/zig

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

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

Visibility: public

Requested revision: 741569d5a70026ada754d0f2809a40d00c9a41ca

Requested commit: 741569d5a70026ada754d0f2809a40d00c9a41ca

Commit: 741569d5a70026ada754d0f2809a40d00c9a41ca

Tree: b881ad69bb05a7a051bda0dc2c007a41d91f784e

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

```
std.Ast.Render: fix conflicts with master branch

```

## Parents

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

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