From fb7ca1ad48c58ebc40493cc085663956010ec58b Mon Sep 17 00:00:00 2001
From: Andrew Kelley <andrew@ziglang.org>
Date: Mon, 9 Jan 2023 14:51:03 -0700
Subject: [PATCH] Sema: fix merge conflict regarding identifiers matching
 primitives

---
 src/Sema.zig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Sema.zig b/src/Sema.zig
index 54e312b5238924b18fbcec0f03ff2509bbe80ce7..9381bf76b5f4310b8e4b54b24204c3cee601fd67 100644
--- a/src/Sema.zig
+++ b/src/Sema.zig
@@ -29337,8 +29337,8 @@ pub fn resolveTypeRequiresComptime(sema: *Sema, ty: Type) CompileError!bool {
         .anyerror,
         .noreturn,
         .@"anyframe",
-        .null,
-        .undefined,
+        .@"null",
+        .@"undefined",
         .atomic_order,
         .atomic_rmw_op,
         .calling_convention,
-- 
2.54.0