# fix merge conflicts with updating line numbers · gitcafe/zig

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

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

Visibility: public

Requested revision: 94648a0383056e99110a4a894b86f4a762e4526c

Requested commit: 94648a0383056e99110a4a894b86f4a762e4526c

Commit: 94648a0383056e99110a4a894b86f4a762e4526c

Tree: 9ae806dc24eefd67ecc59ee480163b337eab57bc

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

```
fix merge conflicts with updating line numbers

```

## Parents

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

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