mirror of
https://github.com/fabrice404/olympics-calendar.git
synced 2026-01-30 09:10:33 +00:00
fix conflicts
This commit is contained in:
@ -48,13 +48,4 @@ DESCRIPTION:Boxing - Women's 75kg - Preliminaries - Round of 16
|
||||
SUMMARY:🥊 Elzbieta WOJCIK 🇵🇱 - 🇮🇪 Aoife O'ROURKE
|
||||
LOCATION:North Paris Arena
|
||||
END:VEVENT
|
||||
BEGIN:VEVENT
|
||||
UID:20240801T094800Z-boxing-WOMENS-66KG-PRELIMINARIES-ROUND-OF-16-TUR-POL
|
||||
DTSTAMP:20240801T094800Z
|
||||
DTSTART:20240801T094800Z
|
||||
DTEND:20240801T095900Z
|
||||
DESCRIPTION:Boxing - Women's 66kg - Preliminaries - Round of 16
|
||||
SUMMARY:🥊 Busenaz SURMENELI 🇹🇷 - 🇵🇱 Aneta RYGIELSKA
|
||||
LOCATION:North Paris Arena
|
||||
END:VEVENT
|
||||
END:VCALENDAR
|
||||
@ -58,12 +58,13 @@ SUMMARY:🥊 Kaan AYKUTSUN 🇹🇷 - 🇨🇺 Arlen LOPEZ CARDONA
|
||||
LOCATION:North Paris Arena
|
||||
END:VEVENT
|
||||
BEGIN:VEVENT
|
||||
UID:20240801T094800Z-boxing-WOMENS-66KG-PRELIMINARIES-ROUND-OF-16-TUR-POL
|
||||
UID:20240801T094800Z-boxing-WOMENS-66KG-PRELIMINARIES-ROUND-OF-16
|
||||
DTSTAMP:20240801T094800Z
|
||||
DTSTART:20240801T094800Z
|
||||
DTEND:20240801T095900Z
|
||||
DESCRIPTION:Boxing - Women's 66kg - Preliminaries - Round of 16
|
||||
SUMMARY:🥊 Busenaz SURMENELI 🇹🇷 - 🇵🇱 Aneta RYGIELSKA
|
||||
DESCRIPTION:Boxing - Women's 66kg - Preliminaries - Round of 16\n🇹🇷
|
||||
Busenaz SURMENELI
|
||||
SUMMARY:🥊 Women's 66kg - Preliminaries - Round of 16
|
||||
LOCATION:North Paris Arena
|
||||
END:VEVENT
|
||||
BEGIN:VEVENT
|
||||
|
||||
@ -1161,12 +1161,13 @@ SUMMARY:🥊 Monique SURACI 🇦🇺 - 🇨🇴 Ingrit Lorena VALENCIA VICTORIA
|
||||
LOCATION:North Paris Arena
|
||||
END:VEVENT
|
||||
BEGIN:VEVENT
|
||||
UID:20240801T094800Z-boxing-WOMENS-66KG-PRELIMINARIES-ROUND-OF-16-TUR-POL
|
||||
UID:20240801T094800Z-boxing-WOMENS-66KG-PRELIMINARIES-ROUND-OF-16
|
||||
DTSTAMP:20240801T094800Z
|
||||
DTSTART:20240801T094800Z
|
||||
DTEND:20240801T095900Z
|
||||
DESCRIPTION:Boxing - Women's 66kg - Preliminaries - Round of 16
|
||||
SUMMARY:🥊 Busenaz SURMENELI 🇹🇷 - 🇵🇱 Aneta RYGIELSKA
|
||||
DESCRIPTION:Boxing - Women's 66kg - Preliminaries - Round of 16\n🇹🇷
|
||||
Busenaz SURMENELI
|
||||
SUMMARY:🥊 Women's 66kg - Preliminaries - Round of 16
|
||||
LOCATION:North Paris Arena
|
||||
END:VEVENT
|
||||
BEGIN:VEVENT
|
||||
|
||||
@ -1708,15 +1708,6 @@ SUMMARY:🥋 Beata PACUT-KLOCZKO 🇵🇱 - 🇧🇮 Ange Ciella NIRAGIRA
|
||||
LOCATION:Champ-de-Mars Arena
|
||||
END:VEVENT
|
||||
BEGIN:VEVENT
|
||||
UID:20240801T094800Z-boxing-WOMENS-66KG-PRELIMINARIES-ROUND-OF-16-TUR-POL
|
||||
DTSTAMP:20240801T094800Z
|
||||
DTSTART:20240801T094800Z
|
||||
DTEND:20240801T095900Z
|
||||
DESCRIPTION:Boxing - Women's 66kg - Preliminaries - Round of 16
|
||||
SUMMARY:🥊 Busenaz SURMENELI 🇹🇷 - 🇵🇱 Aneta RYGIELSKA
|
||||
LOCATION:North Paris Arena
|
||||
END:VEVENT
|
||||
BEGIN:VEVENT
|
||||
UID:20240801T095000Z-fencing-WOMENS-FOIL-TEAM-TABLE-OF-8-JPN-POL
|
||||
DTSTAMP:20240801T095000Z
|
||||
DTSTART:20240801T095000Z
|
||||
|
||||
@ -682,12 +682,13 @@ SUMMARY:🏹 Brady ELLISON 🇺🇸 - 🇹🇷 Abdullah YILDIRMIS
|
||||
LOCATION:Invalides
|
||||
END:VEVENT
|
||||
BEGIN:VEVENT
|
||||
UID:20240801T094800Z-boxing-WOMENS-66KG-PRELIMINARIES-ROUND-OF-16-TUR-POL
|
||||
UID:20240801T094800Z-boxing-WOMENS-66KG-PRELIMINARIES-ROUND-OF-16
|
||||
DTSTAMP:20240801T094800Z
|
||||
DTSTART:20240801T094800Z
|
||||
DTEND:20240801T095900Z
|
||||
DESCRIPTION:Boxing - Women's 66kg - Preliminaries - Round of 16
|
||||
SUMMARY:🥊 Busenaz SURMENELI 🇹🇷 - 🇵🇱 Aneta RYGIELSKA
|
||||
DESCRIPTION:Boxing - Women's 66kg - Preliminaries - Round of 16\n🇹🇷
|
||||
Busenaz SURMENELI
|
||||
SUMMARY:🥊 Women's 66kg - Preliminaries - Round of 16
|
||||
LOCATION:North Paris Arena
|
||||
END:VEVENT
|
||||
BEGIN:VEVENT
|
||||
|
||||
@ -17503,12 +17503,13 @@ SUMMARY:🥋 Women -78 kg Quarterfinal
|
||||
LOCATION:Champ-de-Mars Arena
|
||||
END:VEVENT
|
||||
BEGIN:VEVENT
|
||||
UID:20240801T094800Z-boxing-WOMENS-66KG-PRELIMINARIES-ROUND-OF-16-TUR-POL
|
||||
UID:20240801T094800Z-boxing-WOMENS-66KG-PRELIMINARIES-ROUND-OF-16
|
||||
DTSTAMP:20240801T094800Z
|
||||
DTSTART:20240801T094800Z
|
||||
DTEND:20240801T095900Z
|
||||
DESCRIPTION:Boxing - Women's 66kg - Preliminaries - Round of 16
|
||||
SUMMARY:🥊 Busenaz SURMENELI 🇹🇷 - 🇵🇱 Aneta RYGIELSKA
|
||||
DESCRIPTION:Boxing - Women's 66kg - Preliminaries - Round of 16\n🇹🇷
|
||||
Busenaz SURMENELI
|
||||
SUMMARY:🥊 Women's 66kg - Preliminaries - Round of 16
|
||||
LOCATION:North Paris Arena
|
||||
END:VEVENT
|
||||
BEGIN:VEVENT
|
||||
|
||||
@ -5772,11 +5772,7 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<<<<<<< HEAD
|
||||
<div class="event py-4" data-start="20240728T083000Z" data-end="20240728T133000Z" data-noc="GBR,JPN,GBR,FRA,FRA,NZL,GER,NED,ITA,SWE,BEL,USA,AUS,SUI,CAN,JPN,IRL,SUI,BRA,BEL,ESP,NED,IRL,SWE,CAN,FIN,NZL,BRA,POL,HUN,USA,DEN,ESP,CZE,AUS,ECU,GER,POL,CHN,ITA,FIN,RSA,CHN,POR,MAR,AUT,CZE,ECU,GER,AUS,CAN,IRL,SUI,USA,POL,SWE,GBR,BRA,NZL,JPN,ITA,NED,FRA,BEL">
|
||||
=======
|
||||
<div class="event py-4" data-start="20240728T083000Z" data-end="20240728T133000Z" data-noc="GBR,JPN,GBR,FRA,NZL,GER,NED,ITA,SWE,BEL,USA,AUS,SUI,CAN,JPN,IRL,SUI,BRA,ESP,NED,IRL,SWE,CAN,FIN,NZL,BRA,POL,HUN,USA,DEN,ESP,CZE,AUS,ECU,GER,POL,CHN,ITA,FRA,BEL,FIN,RSA,CHN,POR,MAR,AUT,CZE,ECU,GER,AUS,CAN,IRL,SUI,USA,POL,SWE,GBR,BRA,NZL,JPN,ITA,NED,FRA,BEL">
|
||||
>>>>>>> 9b224cd (fix gender)
|
||||
<div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
|
||||
<div class="w-3/5 align-top inline-block text-black pl-2">
|
||||
<div class="text-2xl">
|
||||
@ -5851,11 +5847,7 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<<<<<<< HEAD
|
||||
<div class="event py-4" data-start="20240728T083000Z" data-end="20240728T133000Z" data-noc="GBR,FRA,JPN,SUI,NED,BEL,NZL,SWE,IRL,CAN,USA,BRA,ITA,GER,AUS,POL">
|
||||
=======
|
||||
<div class="event py-4" data-start="20240728T083000Z" data-end="20240728T133000Z" data-noc="GBR,JPN,SUI,NED,NZL,SWE,IRL,CAN,USA,BRA,ITA,GER,AUS,POL,FRA,BEL">
|
||||
>>>>>>> 9b224cd (fix gender)
|
||||
<div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
|
||||
<div class="w-3/5 align-top inline-block text-black pl-2">
|
||||
<div class="text-2xl">
|
||||
@ -6846,7 +6838,7 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="event py-4" data-start="20240728T100000Z" data-end="20240728T135000Z" data-noc="CHN,AUS,CHN,ESP,RSA,AUS,ESP,CHN,NED,BRA,BRA,JPN,BRA,USA,AUS,NED,FRA,JPN,USA,THA,JPN,USA">
|
||||
<div class="event py-4" data-start="20240728T100000Z" data-end="20240728T135000Z" data-noc="CHN,AUS,CHN,ESP,RSA,AUS,NED,ESP,BRA,BRA,CHN,JPN,BRA,USA,AUS,NED,FRA,JPN,USA,THA,JPN,USA">
|
||||
<div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
|
||||
<div class="w-3/5 align-top inline-block text-black pl-2">
|
||||
<div class="text-2xl">
|
||||
@ -24660,13 +24652,9 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="event py-4" data-start="20240801T094800Z" data-end="20240801T095900Z" data-noc="TUR,POL">
|
||||
<div class="event py-4" data-start="20240801T094800Z" data-end="20240801T095900Z" data-noc="TUR">
|
||||
<div class="time w-1/4 align-top text-right inline-block text-5xl text-center tabular-nums pr-2 border-r border-slate-900/10">__:__</div>
|
||||
<div class="w-3/5 align-top inline-block text-black pl-2">
|
||||
<<<<<<< HEAD
|
||||
<div class="text-2xl" BOXING </div>
|
||||
<div class="">Busenaz SURMENELI 🇹🇷 - 🇵🇱 Aneta RYGIELSKA
|
||||
=======
|
||||
<div class="text-2xl">
|
||||
|
||||
BOXING
|
||||
@ -24674,7 +24662,6 @@
|
||||
</div>
|
||||
<div class="">Women's 66kg - Preliminaries - Round of 16
|
||||
<div class="competitor TUR">🇹🇷 Busenaz SURMENELI</div>
|
||||
>>>>>>> 9b224cd (fix gender)
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user