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