resolve merge conflic

2026-03-10 14:16:53 +07:00
parent 79c91d83e5 0c7aeedf55
commit a83d90cea3
6 changed files with 445 additions and 95 deletions
@@ -2,7 +2,11 @@

 namespace App\Http\Controllers;

-abstract class Controller
+use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
+use Illuminate\Foundation\Validation\ValidatesRequests;
+use Illuminate\Routing\Controller as BaseController;
+
+class Controller extends BaseController
 {
-    //
-}
+    use AuthorizesRequests, ValidatesRequests;
+}