#4-merge-with-master-conflict-resolve

This commit is contained in:
2026-05-12 11:00:22 +08:00
19 changed files with 819 additions and 79 deletions

15
app/Models/Category.php Normal file
View File

@@ -0,0 +1,15 @@
<?php
namespace App\Models;
use Database\Factories\CategoryFactory;
use Illuminate\Database\Eloquent\Attributes\Fillable;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
#[Fillable(['name', 'slug', 'description', 'color'])]
class Category extends Model
{
/** @use HasFactory<CategoryFactory> */
use HasFactory;
}