Resolve merge conflicts

2026-02-17 14:44:47 +05:30
parent 94e211f87e 8b6d3d5fad
commit 33571a5fd7
84 changed files with 16116 additions and 5486 deletions
--- a/app/Models/ChatMessage.php
+++ b/app/Models/ChatMessage.php
@@ -10,6 +10,7 @@ class ChatMessage extends Model
    use HasFactory;

    protected $fillable = [
+<<<<<<< HEAD
        'ticket_id',
        'sender_id',
        'sender_type',   // user OR admin
@@ -17,6 +18,19 @@ class ChatMessage extends Model
        'file_path',
        'file_type',
    ];
+=======
+    'ticket_id',
+    'sender_id',
+    'sender_type',
+    'message',
+    'file_path',
+    'file_type',
+    'read_by_admin',
+    'read_by_user',
+    'client_id',
+];
+
+>>>>>>> 8b6d3d5fadadda310ef45ec03c879b900bff4cb025f45d1bb5d188761d53e043

    /**
     * The ticket this message belongs to.