From 21d7d19c835a0f0808aee904bec5ec46ad82bd46 Mon Sep 17 00:00:00 2001
From: Derek Slenk <derek.slenk@gmail.com>
Date: Wed, 16 Jul 2025 11:30:07 -0400
Subject: [PATCH] Resolve merge conflict in .claude/settings.local.json

---
 .claude/settings.local.json | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/.claude/settings.local.json b/.claude/settings.local.json
index a9873cd..8839b87 100644
--- a/.claude/settings.local.json
+++ b/.claude/settings.local.json
@@ -1,9 +1,16 @@
-{
-  "permissions": {
-    "allow": [
-      "Bash(find:*)",
-      "Bash(ls:*)"
-    ],
-    "deny": []
-  }
+{
+  "permissions": {
+    "allow": [
+      "Bash(find:*)",
+      "Bash(ls:*)",
+      "Bash(git pull:*)",
+      "Bash(git remote set-url:*)",
+      "Bash(git add:*)",
+      "Bash(git commit:*)",
+      "Bash(mv:*)",
+      "Bash(git checkout:*)",
+      "Bash(git push:*)"
+    ],
+    "deny": []
+  }
 }
\ No newline at end of file