# std.crypto.asn1: fix merge conflicts · gitcafe/zig

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

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

Visibility: public

Requested revision: dd54c48aa249ce7b7a66c0f2568c1e5fa84e6012

Requested commit: dd54c48aa249ce7b7a66c0f2568c1e5fa84e6012

Commit: dd54c48aa249ce7b7a66c0f2568c1e5fa84e6012

Tree: 7c66f99f10ddcbd2f1026151e1aad8c413c7d89d

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

```
std.crypto.asn1: fix merge conflicts

```

## Parents

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

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