From fa7ee0d9461232410d397528f438e23e711341ed Mon Sep 17 00:00:00 2001
From: Cursor Agent <cursoragent@cursor.com>
Date: Sun, 23 Aug 2026 23:31:01 +0000
Subject: [PATCH] Narrow conflict-marker CI check to <<<<<<< and >>>>>>>

---
 .github/workflows/ci.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a265caf..152edf3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,8 +13,7 @@ jobs:
 
       - name: Reject merge conflict markers
         run: |
-          if git grep -nE '^(<<<<<<<|>>>>>>>|=======)' -- . \
-            ':(exclude)*.lock' \
+          if git grep -nE '^(<<<<<<<|>>>>>>>)' -- . \
             ':(exclude)package-lock.json'; then
             echo "::error::Merge conflict markers found in tracked files"
             exit 1