authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2023-01-09 14:51:03-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2023-01-09 14:51:03-07:00
logfb7ca1ad48c58ebc40493cc085663956010ec58b
treed3e606c9f3504cca6dfd5e3a9a8c170534010d08
parentaa7e65d5ba865132e7080b9d1c8a2fb0eb38cc28

Sema: fix merge conflict regarding identifiers matching primitives

1 files changed, 2 insertions(+), 2 deletions(-)

src/Sema.zig+2-2
...@@ -29337,8 +29337,8 @@ pub fn resolveTypeRequiresComptime(sema: *Sema, ty: Type) CompileError!bool {...@@ -29337,8 +29337,8 @@ pub fn resolveTypeRequiresComptime(sema: *Sema, ty: Type) CompileError!bool {
29337 .anyerror,29337 .anyerror,
29338 .noreturn,29338 .noreturn,
29339 .@"anyframe",29339 .@"anyframe",
29340 .null,29340 .@"null",
29341 .undefined,29341 .@"undefined",
29342 .atomic_order,29342 .atomic_order,
29343 .atomic_rmw_op,29343 .atomic_rmw_op,
29344 .calling_convention,29344 .calling_convention,