From 826a22dc2b54232655f4e0642885b4bad7f8ffd6 Mon Sep 17 00:00:00 2001
From: aiongg <aiongtaigi@gmail.com>
Date: Thu, 22 Oct 2026 02:36:21 +0000
Subject: [PATCH] Integration: #2131 remove a leftover conflict marker line in
 ROADMAP.md

---
 ROADMAP.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ROADMAP.md b/ROADMAP.md
index ebec2f475..c9e8043d6 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -3,7 +3,6 @@
 **Stage: alpha** · next: beta, ~25 points of "ready for real work" and ~160–240 h away
 
 > **Last reviewed:** 2026-10-11 · **Last updated:** 2026-10-21 · **Change:** minor (Page Setup paper sizes: JIS B4/B5/B6, the Japanese postcards and envelopes, and A6; long flat operator chains up to Excel's formula limit) · **Target:** Microsoft Excel (Microsoft 365)
->>>>>>> upr/2131
 
 GridCraft aims at full Microsoft Excel parity, and at being better in places: faster, open (XLSX
 is the native format), fully scriptable by agents (MCP, control channel, CLI), and on the web.