Skip to content

Commit

Permalink
fix merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
brauliorivas committed Jun 25, 2024
2 parents 7a9c4cd + 5357f15 commit 2342d59
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

<link rel="stylesheet" href="css/main.css">
<link rel="stylesheet" href="css/dmx-logo.css">
<link rel="stylesheet" href="css/dmx-logo.css">
<link rel="stylesheet" href="css/canvas.css">
<link rel="stylesheet" href="css/modal.css">
<link rel="stylesheet" href="css/toggle.css">
Expand All @@ -24,6 +25,7 @@

<p>Welcome to <span id="logo">
<span class="logo-d">d</span><span class="logo-m">m</span><span class="logo-x">X</span>
<span class="logo-d">d</span><span class="logo-m">m</span><span class="logo-x">X</span>
</span></p>

<div id="input-message">
Expand Down Expand Up @@ -151,6 +153,7 @@
<script type="module" src="js/main.js"></script>
<script type="module" src="js/menu/filter/filter.js"></script>
<script type="module" src="js/information.js"></script>
<script type="module" src="js/information.js"></script>
</body>

</html>

0 comments on commit 2342d59

Please sign in to comment.