andre/olympics-calendar
1
0
Fork 0
mirror of https://github.com/fabrice404/olympics-calendar.git synced 2026-03-11 00:09: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/general/CAN.ics
View File

@@ -614,16 +614,6 @@ SUMMARY:⛵ Women's Skiff - Race 3
LOCATION:Marseille Marina
END:VEVENT
BEGIN:VEVENT
UID:20240728T120500Z-fencing-WOMENS-FOIL-INDIVIDUAL-TABLE-OF-16
DTSTAMP:20240728T120500Z
DTSTART:20240728T120500Z
DTEND:20240728T123500Z
DESCRIPTION:Fencing - Women's Foil Individual Table of 16\n🇨🇦 Yunjia
ZHANG
SUMMARY:🤺 Women's Foil Individual Table of 16
LOCATION:Grand Palais
END:VEVENT
BEGIN:VEVENT
UID:20240728T120700Z-sailing-MENS-SKIFF-RACE-2
DTSTAMP:20240728T120700Z
DTSTART:20240728T120700Z

12
docs/general/ISR.ics
View File

@@ -188,18 +188,6 @@ SUMMARY:🥋 Nurali EMOMALI 🇹🇯 - 🇮🇱 Baruch SHMAILOV
LOCATION:Champ-de-Mars Arena
END:VEVENT
BEGIN:VEVENT
<<<<<<< HEAD
UID:20240728T093000Z-judo-WOMEN-52-KG-ELIMINATION-ROUND-OF-16
DTSTAMP:20240728T093000Z
DTSTART:20240728T093000Z
DTEND:20240728T093600Z
DESCRIPTION:Judo - Women -52 kg Elimination Round of 16\n🇮🇱 Gefen PRIMO
SUMMARY:🥋 Women -52 kg Elimination Round of 16
LOCATION:Champ-de-Mars Arena
END:VEVENT
BEGIN:VEVENT
=======
>>>>>>> 50ece52 (add medal only events)
UID:20240728T101300Z-sailing-WOMENS-WINDSURFING-RACE-1
DTSTAMP:20240728T101300Z
DTSTART:20240728T101300Z

5
docs/general/general.ics
View File

@@ -4608,7 +4608,7 @@ UID:20240728T093000Z-judo-WOMEN-52-KG-ELIMINATION-ROUND-OF-16
DTSTAMP:20240728T093000Z
DTSTART:20240728T093000Z
DTEND:20240728T093600Z
DESCRIPTION:Judo - Women -52 kg Elimination Round of 16\n🇮🇱 Gefen PRIMO
DESCRIPTION:Judo - Women -52 kg Elimination Round of 16
SUMMARY:🥋 Women -52 kg Elimination Round of 16
LOCATION:Champ-de-Mars Arena
END:VEVENT
@@ -6041,8 +6041,7 @@ UID:20240728T120500Z-fencing-WOMENS-FOIL-INDIVIDUAL-TABLE-OF-16
DTSTAMP:20240728T120500Z
DTSTART:20240728T120500Z
DTEND:20240728T123500Z
DESCRIPTION:Fencing - Women's Foil Individual Table of 16\n🇨🇦 Yunjia
ZHANG
DESCRIPTION:Fencing - Women's Foil Individual Table of 16
SUMMARY:🤺 Women's Foil Individual Table of 16
LOCATION:Grand Palais
END:VEVENT