From 579db4640b2a6bada8580af83b5fbf1d3c310b6d Mon Sep 17 00:00:00 2001
From: beo3000 <pakabu@web.de>
Date: Thu, 25 Dec 2025 16:34:59 +0100
Subject: [PATCH] mod claude permissions

---
 .claude/settings.local.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.claude/settings.local.json b/.claude/settings.local.json
index ec16447..6b3d6ec 100644
--- a/.claude/settings.local.json
+++ b/.claude/settings.local.json
@@ -8,7 +8,8 @@
       "Bash(git add:*)",
       "Bash(git commit:*)",
       "Bash(mkdir:*)",
-      "WebSearch"
+      "WebSearch",
+      "Bash(git merge:*)"
     ]
   }
 }