From 6b87cef023246c92b8eaca0a19f20f6e0aa994dd Mon Sep 17 00:00:00 2001
From: Afiq Hamzah <afiqhamzah@PKBs-MacBook-Pro.local>
Date: Tue, 14 Nov 2023 14:45:48 +0800
Subject: [PATCH] Add new columns to komuditi_transaksi

---
 config/database.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/config/database.php b/config/database.php
index ece90e4..cc1803f 100644
--- a/config/database.php
+++ b/config/database.php
@@ -2,7 +2,15 @@
 
 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' => [