add conflict from branch new-onepercent

2023-11-30 11:23:53 +08:00
parent 532240fdcb 096025bcbc
commit 32adaef8ef
5 changed files with 79 additions and 67 deletions
@@ -31,7 +31,7 @@ class GadaiFactory
            'cajtelahbyr' => null,
            'ansuran' => null,
            'ansupah' => null,
-            'kadarupah' => null,
+            'kadarupah' => 1.7,
            'tempoh' => 0.5,
            't_lelong' => null,
            't_hapus' => null,