From 1b54b9cfd7e80a85c63ccf46c48bbad316b821b9 Mon Sep 17 00:00:00 2001
From: Christoph Tyralla <c.tyralla@bjoernsen.de>
Date: Sat, 7 Jun 2025 00:37:34 +0200
Subject: [PATCH] Fix a minor merge conflict caused by #19118.

---
 test-data/unit/check-narrowing.test | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test-data/unit/check-narrowing.test b/test-data/unit/check-narrowing.test
index 6febe253d316..47ad62248fe0 100644
--- a/test-data/unit/check-narrowing.test
+++ b/test-data/unit/check-narrowing.test
@@ -2436,7 +2436,7 @@ y = None
 for x in xs:
     if x is not None:
         if y is None:
-            y = {}  # E: Need type annotation for "y" (hint: "y: Dict[<type>, <type>] = ...")
+            y = {}  # E: Need type annotation for "y" (hint: "y: dict[<type>, <type>] = ...")
 
 [builtins fixtures/list.pyi]