From b6e6bda92533b8f0de5862456a138ca281d101e7 Mon Sep 17 00:00:00 2001 From: Samuel Tariku Date: Thu, 24 Jul 2025 16:08:49 +0300 Subject: [PATCH] fix: merge issues --- db/migrations/000007_setting_data.up.sql | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/db/migrations/000007_setting_data.up.sql b/db/migrations/000007_setting_data.up.sql index 8b96ee4..45e1e69 100644 --- a/db/migrations/000007_setting_data.up.sql +++ b/db/migrations/000007_setting_data.up.sql @@ -1,22 +1,11 @@ -- Settings Initial Data INSERT INTO settings (key, value) -<<<<<<< HEAD VALUES ('max_number_of_outcomes', '30'), -======= -VALUES ('sms_provider', '30'), -('max_number_of_outcomes', '30'), ->>>>>>> d43b12c589d32e4b6147cfb54a3b939c476bae6f ('bet_amount_limit', '100000'), ('daily_ticket_limit', '50'), ('total_winnings_limit', '1000000'), ('amount_for_bet_referral', '1000000'), -<<<<<<< HEAD - ('cashback_amount_cap', '1000') -ON CONFLICT (key) -DO UPDATE SET value = EXCLUDED.value; -======= ('cashback_amount_cap', '1000') ON CONFLICT (key) DO UPDATE SET value = EXCLUDED.value; ->>>>>>> d43b12c589d32e4b6147cfb54a3b939c476bae6f