Merge remote-tracking branch 'origin/dev' into dev

# Conflicts: # secret_santa.html
2023-12-24 23:43:38 +01:00 · 2023-12-24 23:43:38 +01:00 · db52900ad8
parent 5c8a9e5a02
commit db52900ad8
1 changed files with 0 additions and 3 deletions
--- a/secret_santa.html
+++ b/secret_santa.html
@ -3,11 +3,8 @@
 <head>
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-<<<<<<< HEAD
    <title>Graphe du Secret Santa</title>
-=======
    <title>D3.js Interactive Cycle Graph with Alternating Curved Arrows</title>
->>>>>>> origin/dev
    <script src="https://d3js.org/d3.v5.min.js"></script>
    <style>
        body, html {