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

# Conflicts:
#	secret_santa.html
This commit is contained in:
Valentin Moguérou 2023-12-24 23:42:12 +01:00
commit 5c8a9e5a02
1 changed files with 4 additions and 0 deletions

View File

@ -3,7 +3,11 @@
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<<<<<<< HEAD
<title>Graphe du Secret Santa</title> <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> <script src="https://d3js.org/d3.v5.min.js"></script>
<style> <style>
body, html { body, html {