merge user dan role conflict resolved

2026-05-11 12:43:43 +08:00
parent 3e79e74cb7 eaf0ba7a4d
commit dc48e38ba6
14 changed files with 409 additions and 0 deletions
--- a/.claude/settings.local.json
+++ b/.claude/settings.local.json
@@ -1,6 +1,10 @@
 {
  "permissions": {
    "allow": [
+<<<<<<< HEAD
+=======
+      "mcp__laravel-boost__database-schema",
+>>>>>>> role-module
      "Bash(php artisan *)",
      "Bash(vendor/bin/pint --dirty --format agent)",
      "mcp__laravel-boost__search-docs"