fix conflicts

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

View File

@@ -103,16 +103,6 @@ SUMMARY:🤺 Jessica Zi Jia GUO 🇨🇦 - 🇨🇱 Arantza INOSTROZA
LOCATION:Grand Palais
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:20240729T072500Z-fencing-MENS-FOIL-INDIVIDUAL-TABLE-OF-64-CAN-ISV
DTSTAMP:20240729T072500Z
DTSTART:20240729T072500Z

View File

@@ -971,8 +971,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