Resolve remaining merge conflicts

2025-10-05 16:29:00 +08:00
parent 95ae90b96e
commit c80a676429
2 changed files with 0 additions and 12 deletions
@@ -70,11 +70,6 @@ class PampasanController extends Controller
        Palsu::on($cawangan['mysql'])
            ->where('norujukan', $norujukan)
            ->update(['status' => 1]);
-<<<<<<< HEAD
-=======
-
-        // dd($pampasan);
->>>>>>> 83d619ac (Continue dev on pampasan module)

        return $this->successResponse('Status Pampasan berjaya dituntut.', $pampasan, 201);
    }