Yimaru/Yimaru-BackEnd
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: merge issues

Browse Source
This commit is contained in:
Samuel Tariku 2025-07-24 16:08:49 +03:00
parent 982573d67e
commit b6e6bda925
1 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
db/migrations/000007_setting_data.up.sql
View File

@ -1,22 +1,11 @@
-- Settings Initial Data -- Settings Initial Data
INSERT INTO settings (key, value) INSERT INTO settings (key, value)
<<<<<<< HEAD
VALUES VALUES
('max_number_of_outcomes', '30'), ('max_number_of_outcomes', '30'),
=======
VALUES ('sms_provider', '30'),
('max_number_of_outcomes', '30'),
>>>>>>> d43b12c589d32e4b6147cfb54a3b939c476bae6f
('bet_amount_limit', '100000'), ('bet_amount_limit', '100000'),
('daily_ticket_limit', '50'), ('daily_ticket_limit', '50'),
('total_winnings_limit', '1000000'), ('total_winnings_limit', '1000000'),
('amount_for_bet_referral', '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 ('cashback_amount_cap', '1000') ON CONFLICT (key) DO
UPDATE UPDATE
SET value = EXCLUDED.value; SET value = EXCLUDED.value;
>>>>>>> d43b12c589d32e4b6147cfb54a3b939c476bae6f