fix: merge issues
This commit is contained in:
parent
982573d67e
commit
b6e6bda925
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user