From 9c1fcc4bef97b4dd9f76d992ebcab35d9a58ad3e Mon Sep 17 00:00:00 2001 From: Vittoria Date: Tue, 10 Nov 2026 14:50:45 +0100 Subject: [PATCH 1/2] Added an X after Vittoria Hu --- students26.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/students26.txt b/students26.txt index a2681ba0..357656a2 100644 --- a/students26.txt +++ b/students26.txt @@ -38,7 +38,7 @@ Hayden Gatlin X Yonas Grossard-Amin Quiterie Guignard Thomas Hammer -Vittoria Hu +Vittoria Hu X Margaux Jacobelli Ajay Jampana Martin Jomier From dd028a8250306dd97046f38ef4157be85ee02ee4 Mon Sep 17 00:00:00 2001 From: Vittoria Hu Date: Tue, 10 Nov 2026 15:10:20 +0100 Subject: [PATCH 2/2] Remove remaining conflict markers --- students26.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/students26.txt b/students26.txt index 0b3748ad..d6cbc466 100644 --- a/students26.txt +++ b/students26.txt @@ -38,10 +38,8 @@ Hayden Gatlin X Yonas Grossard-Amin Quiterie Guignard Thomas Hammer -<<<<<<< HEAD Vittoria Hu X Margaux Jacobelli X ->>>>>>> dbc356d3ab3d96f3643dc1589297b2950fb15847 Ajay Jampana Martin Jomier Hugo Keothavong X