diff --git a/secret_santa.html b/secret_santa.html index a01905c..69e0049 100644 --- a/secret_santa.html +++ b/secret_santa.html @@ -3,7 +3,11 @@ +<<<<<<< HEAD Graphe du Secret Santa +======= + D3.js Interactive Cycle Graph with Alternating Curved Arrows +>>>>>>> origin/dev