Resolve merge conflict in .claude/settings.local.json
This commit is contained in:
parent
08d6605fcc
commit
21d7d19c83
1 changed files with 15 additions and 8 deletions
|
@ -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": []
|
||||
}
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue