synced with master

2023-03-06 15:27:17 +02:00
parent 5344ec83fa af34eb544d
commit 8de0e61cf4
57 changed files with 2340 additions and 5 deletions
@@ -44,8 +44,13 @@
        window.Prism = window.Prism || {};
        window.Prism.manual = true;
    </script>
+<<<<<<< HEAD
  <script type="module" crossorigin src="./assets/index-d58d12b2.js"></script>
  <link rel="stylesheet" href="./assets/index-39aca13b.css">
+=======
+  <script type="module" crossorigin src="./assets/index-f865402a.js"></script>
+  <link rel="stylesheet" href="./assets/index-d0b55baa.css">
+>>>>>>> master
 </head>
 <body>
    <div id="app"></div>