andre/olympics-calendar
1
0
Fork 0
mirror of https://github.com/fabrice404/olympics-calendar.git synced 2026-03-07 22:19:55 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix conflicts

Browse Source
This commit is contained in:
Fabrice Lamant
2024-07-28 10:50:34 +02:00
parent 642130a5ad
commit 70a3c2c130
8 changed files with 6 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
docs/today.html
View File

@@ -4053,11 +4053,7 @@
</div>
</div>
</div>
<<<<<<< HEAD
<div class="event py-4" data-start="20240728T083000Z" data-end="20240728T133000Z" data-noc="GER,AUS,CHN,CAN,IRL,SUI,USA,POL,SWE,GBR,BRA,NZL,JPN,ITA,NED,FRA,BEL,ESP,HUN,CZE,ECU,FIN,DEN,ESP,GER,AUS,CAN,IRL,SUI,USA,POL,SWE,GBR,BRA,NZL,JPN,ITA,NED,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">
=======
<div class="event py-4" data-start="20240728T083000Z" data-end="20240728T133000Z" data-noc="GER,CHN,AUS,CAN,IRL,SUI,USA,POL,SWE,GBR,BRA,NZL,JPN,ITA,NED,FRA,BEL,ESP,HUN,CZE,ECU,FIN,DEN,ESP,GER,AUS,CAN,IRL,SUI,USA,POL,SWE,GBR,BRA,NZL,JPN,ITA,NED,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">
>>>>>>> 50ece52 (add medal only events)
<div class="time w-1/4 align-top text-right inline-block text-5xl text-center 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">EQUESTRIAN</div>
@@ -4587,12 +4583,11 @@
</div>
</div>
</div>
<div class="event py-4" data-start="20240728T093000Z" data-end="20240728T093600Z" data-noc="ISR">
<div class="event py-4" data-start="20240728T093000Z" data-end="20240728T093600Z" data-noc="">
<div class="time w-1/4 align-top text-right inline-block text-5xl text-center 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">JUDO</div>
<div class="">Women -52 kg Elimination Round of 16
<div class="competitor ISR">🇮🇱 Gefen PRIMO</div>
</div>
</div>
</div>
@@ -6067,12 +6062,11 @@
</div>
</div>
</div>
<div class="event py-4" data-start="20240728T120500Z" data-end="20240728T123500Z" data-noc="CAN">
<div class="event py-4" data-start="20240728T120500Z" data-end="20240728T123500Z" data-noc="">
<div class="time w-1/4 align-top text-right inline-block text-5xl text-center 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">FENCING</div>
<div class="">Women's Foil Individual Table of 16
<div class="competitor CAN">🇨🇦 Yunjia ZHANG</div>
</div>
</div>
</div>