Conflict

Author: matthewmturner

.claude/settings.local.json

@@ -26,13 +26,9 @@
       "Bash(test:*)",
       "WebFetch(domain:github.com)",
       "Bash(ls:*)",
-<<<<<<< Updated upstream
-      "Bash(grep:*)"
-=======
       "Bash(grep:*)",
       "Bash(cargo fmt:*)",
       "Bash(./target/release/dft:*)"
->>>>>>> Stashed changes
     ],
     "deny": [],
     "ask": []