From c80a6764294308299e24255a6f441e5fd077352a Mon Sep 17 00:00:00 2001
From: Afiq Hamzah <afiq.hamzah@pkb.net.my>
Date: Sun, 5 Oct 2025 16:29:00 +0800
Subject: [PATCH] Resolve remaining merge conflicts

---
 app/Http/Controllers/PampasanController.php | 5 -----
 app/Palsu.php                               | 7 -------
 2 files changed, 12 deletions(-)

diff --git a/app/Http/Controllers/PampasanController.php b/app/Http/Controllers/PampasanController.php
index 1972c2a..cdbeb86 100644
--- a/app/Http/Controllers/PampasanController.php
+++ b/app/Http/Controllers/PampasanController.php
@@ -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);
     }
diff --git a/app/Palsu.php b/app/Palsu.php
index 7defa11..00ce962 100644
--- a/app/Palsu.php
+++ b/app/Palsu.php
@@ -32,10 +32,6 @@ class Palsu extends Model
         'untungonepercent',
         'untungcajlain',
         'pembiayaan',
-<<<<<<< HEAD
-=======
-        'jenis',
->>>>>>> 83d619ac (Continue dev on pampasan module)
         'status',
     ];
 
@@ -99,12 +95,9 @@ class Palsu extends Model
     {
         return $this->hasOne(Tebus::class, 'norujukan', 'norujukan');
     }
-<<<<<<< HEAD
     
     public function gadai(): HasOne
     {
         return $this->hasOne(Gadai::class, 'norujukan', 'norujukan');
     }
-=======
->>>>>>> 83d619ac (Continue dev on pampasan module)
 }