From db52900ad898f6a0108dd600609985ff0950f552 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Valentin=20Mogu=C3=A9rou?= Date: Sun, 24 Dec 2023 23:43:38 +0100 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # secret_santa.html --- secret_santa.html | 3 --- 1 file changed, 3 deletions(-) diff --git a/secret_santa.html b/secret_santa.html index 69e0049..220b580 100644 --- a/secret_santa.html +++ b/secret_santa.html @@ -3,11 +3,8 @@ -<<<<<<< HEAD Graphe du Secret Santa -======= D3.js Interactive Cycle Graph with Alternating Curved Arrows ->>>>>>> origin/dev