From 5f736cfd3ee7dd1bf6d00eb7ca37a2f2549e759c Mon Sep 17 00:00:00 2001 From: Razmig Sarkissian Date: Tue, 18 Jun 2019 08:29:30 +0200 Subject: [PATCH] fix seed merge --- TournamentStats/Seed.swift | 3 --- 1 file changed, 3 deletions(-) diff --git a/TournamentStats/Seed.swift b/TournamentStats/Seed.swift index c01d6b6..21a9291 100644 --- a/TournamentStats/Seed.swift +++ b/TournamentStats/Seed.swift @@ -53,11 +53,8 @@ class Seed { TD(date: "14/06/2019", name: "No-Limit Hold'em", number: 28, buyin: 1000, entries: 2477, prizePool: 2229300), TD(date: "15/06/2019", name: "HORSE", number: 29, buyin: 10000, entries: 172, prizePool: 1616800), TD(date: "16/06/2019", name: "Pot-Limit Omaha", number: 30, buyin: 1000, entries: 1526, prizePool: 1374300), -<<<<<<< HEAD -======= TD(date: "15/06/2019", name: "No-Limit Hold'em 6-Handed", number: 31, buyin: 3000, entries: 754, prizePool: 2035800), TD(date: "17/06/2019", name: "Seniors No-Limit Hold'em", number: 32, buyin: 1000, entries: 5916 , prizePool: 5324400), ->>>>>>> d1933f4ce666f2715d84736692156367207a7458 TD(date: "16/06/2019", name: "Limit 2-7 Lowball Triple Draw", number: 33, buyin: 1500, entries: 467, prizePool: 630450), // TD(date: "13/06/2019", name: "Eight Game Mix", number: 23, buyin: 1500, entries: 612, prizePool: 826200), TD(date: "17/06/2019", name: "WSOP.com ONLINE No-Limit Hold'em Knockout Bounty", number: 38, buyin: 600, entries: 1224, prizePool: 550800),