Resolve merge conflict in settings.local.json

2025-07-15 23:57:44 -04:00 · 2025-07-15 23:57:44 -04:00 · 3461feb9a4
commit 3461feb9a4
parent eae994b32e a8b88b8622
5 changed files with 90 additions and 87 deletions
--- a/.claude/settings.local.json
+++ b/.claude/settings.local.json
@ -6,7 +6,9 @@
      "Bash(git pull:*)",
      "Bash(git remote set-url:*)",
      "Bash(git add:*)",
-      "Bash(git commit:*)"
+      "Bash(git commit:*)",
+      "Bash(mv:*)",
+      "Bash(git checkout:*)"
    ],
    "deny": []
  }