Fix config database.php

2023-11-28 10:02:11 +08:00
parent 668e5c4051
commit dc28211d03
1 changed files with 0 additions and 8 deletions
@@ -2,15 +2,7 @@

 return [

-<<<<<<< HEAD
   'default' => 'mysql7',
-=======
-<<<<<<< HEAD
-   'default' => 'mysql',
-=======
-   'default' => 'mysql7',
->>>>>>> 083caf7 (Add new columns to komuditi_transaksi)
->>>>>>> 01bba68 (Add new columns to komuditi_transaksi)
   'migrations' => 'migrations',
   'connections' => [
        'lelong' => [