Merge branch 'main' of https://git.project-pro.pl/Project-Pro/shopPRO

.claude/settings.local.json

@@ -8,6 +8,7 @@
       "Bash(where:*)",
       "Bash(composer:*)",
       "Bash(curl:*)",
+<<<<<<< HEAD
       "Bash(C:xamppphpphp.exe phpunit.phar --testdox)",
       "Bash(php phpunit.phar:*)",
       "Bash(ls -la \"c:\\\\visual studio code\\\\projekty\\\\shopPRO\\\\autoload\"\" 2>nul | findstr /i \"admin Admin \")",
@@ -21,6 +22,12 @@
       "Bash(powershell.exe -Command \"Add-Type -AssemblyName System.IO.Compression.FileSystem; [System.IO.Compression.ZipFile]::OpenRead\\(''c:\\\\visual studio code\\\\projekty\\\\shopPRO\\\\updates\\\\0.20\\\\ver_0.239.zip''\\).Entries | ForEach-Object { Write-Host $_.FullName }\")",
       "Bash(powershell.exe -NoProfile -Command 'Add-Type -AssemblyName System.IO.Compression.FileSystem; $z = [System.IO.Compression.ZipFile]::OpenRead\\(\"\"c:\\\\visual studio code\\\\projekty\\\\shopPRO\\\\updates\\\\0.20\\\\ver_0.239.zip\"\"\\); foreach \\($e in $z.Entries\\) { $e.FullName }; $z.Dispose\\(\\)')",
       "Bash(powershell.exe -NoProfile -Command:*)"
+=======
+      "Bash(find:*)",
+      "Bash(php:*)",
+      "Bash(C:xamppphpphp.exe -v)",
+      "Bash(/c/xampp/php/php.exe:*)"
+>>>>>>> 471173f45b4ff731f785fbcf8fdc0483af3b4e54
     ]
   }
 }