Resolve merge conflicts in: - bootstrap/helpers/shared.php (kept both formatBytes, isSafeTmpPath, and formatContainerStatus functions) - database/migrations/2025_10_10_120002_create_cloud_init_scripts_table.php (added Schema::hasTable check) - database/migrations/2025_10_10_120002_create_webhook_notification_settings_table.php (added Schema::hasTable check) - resources/views/livewire/project/application/general.blade.php (formatting/whitespace) 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com> |
||
|---|---|---|
| .. | ||
| application | ||
| database | ||
| new | ||
| resource | ||
| service | ||
| shared | ||
| add-empty.blade.php | ||
| clone-me.blade.php | ||
| delete-environment.blade.php | ||
| delete-project.blade.php | ||
| edit.blade.php | ||
| environment-edit.blade.php | ||
| index.blade.php | ||
| show.blade.php | ||