fix: resolve merge conflicts in settings.local.json

Author: Gabry848

.claude/settings.local.json

@@ -38,23 +38,17 @@
       "Bash(cat:*)",
       "Bash(npm run docs:generate:*)",
       "Bash(powershell -Command \"Get-ChildItem -Path . -Recurse | Select-Object -ExpandProperty FullName | Sort-Object\")",
-<<<<<<< HEAD
-<<<<<<< Updated upstream
-      "Bash(git log:*)"
-=======
+      "Bash(git log:*)",
       "Bash(git log:*)",
       "Bash(grep:*)",
       "Bash(powershell -Command \"Get-Content ''e:\\\\MyTaskly\\\\MyTaskly-app\\\\src\\\\locales\\\\en.json'' | Select-Object -Last 20\")",
       "Bash(powershell -Command \"Get-Content ''e:\\\\MyTaskly\\\\MyTaskly-app\\\\src\\\\locales\\\\it.json'' | Select-Object -Last 20\")",
       "Bash(test:*)",
-      "Bash(npm start)"
->>>>>>> Stashed changes
-=======
+      "Bash(npm start)",
       "Bash(git log:*)",
       "Bash(grep:*)",
       "Bash(powershell -Command \"Get-Content ''e:\\\\MyTaskly\\\\MyTaskly-app\\\\src\\\\locales\\\\en.json'' | Select-Object -Last 20\")",
       "Bash(powershell -Command \"Get-Content ''e:\\\\MyTaskly\\\\MyTaskly-app\\\\src\\\\locales\\\\it.json'' | Select-Object -Last 20\")"
->>>>>>> 40288d32f2846e903bc41d36b719adfadd7bd4a4
     ],
     "deny": [],
     "defaultMode": "acceptEdits"