diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2022-03-22 20:44:32 -0700 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2022-03-22 20:44:32 -0700 |
| commit | 8326ab7adb92aff11d19b21a6d42869a361b462b (patch) | |
| tree | a00d577d78d578feb6d5699ce15d09f31a21dffb /src/codegen | |
| parent | e81ebc24e9abf96a6ffbb42cd00587e32e80f23c (diff) | |
| download | zig-8326ab7adb92aff11d19b21a6d42869a361b462b.tar.gz zig-8326ab7adb92aff11d19b21a6d42869a361b462b.zip | |
Sema: fix merge conflicts with previous commit
The previous commit and e8813b296bc55a13b534bd9b2a03e1f6af366915 had
merge conflicts which didn't get caught by git.
Diffstat (limited to 'src/codegen')
0 files changed, 0 insertions, 0 deletions