From 720657b77d7b2cb2a83c031dbd054c151e3c8205 Mon Sep 17 00:00:00 2001
From: Minsu Lee <minsu.lee@pleaseai.dev>
Date: Fri, 3 Jul 2026 16:21:28 +0900
Subject: [PATCH] fix: resolve leftover stash conflict markers in
 .claude/settings.json

Stash conflict markers were committed into the settings file, making it
invalid JSON (reported by /doctor). Keep the stashed-changes side, which
is a superset of the upstream side (all enabledPlugins plus
extraKnownMarketplaces).
---
 .claude/settings.json | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/.claude/settings.json b/.claude/settings.json
index b173bd4..85a1f79 100644
--- a/.claude/settings.json
+++ b/.claude/settings.json
@@ -27,6 +27,21 @@
     "claude-md-management@claude-plugins-official": true,
     "gatekeeper@pleaseai": true,
     "mcp-dev@pleaseai": true,
-    "vitest@pleaseai": true
+    "testing@passionfactory": true,
+    "standards@passionfactory": true,
+    "tidy-first@passionfactory": true,
+    "vitest@pleaseai": true,
+    "research@passionfactory": true,
+    "frontend@passionfactory": true,
+    "modern-web-guidance@pleaseai": true,
+    "plannotator@passionfactory": true
+  },
+  "extraKnownMarketplaces": {
+    "code-intelligence": {
+      "source": {
+        "source": "directory",
+        "path": "./"
+      }
+    }
   }
 }