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/resources/views/admin/chat_window.blade.php
+++ b/resources/views/admin/chat_window.blade.php
@@ -197,5 +197,4 @@ waitForEcho(() => {
        });
 });
 </script>
-
@endsection