Merge pull request #7 from DSDmark/test

DSDmark · web-flow · commit c2fd514b8401 · 2022-12-23T08:10:34.000+05:00
update
diff --git a/index.html b/index.html
@@ -8,7 +8,6 @@
     <link rel="stylesheet" href="./assets/style/style.css" />
   </head>
   <body>
-<<<<<<< HEAD
     <div class="tab">
       <div class="inputField">
         <button class="tablinks" id="stopbutton">Stop Sorting</button> <br />
@@ -73,10 +72,8 @@
       <canvas id="cvs"></canvas>
     </div>
     <!-- The main section when all things will heppening -->
-=======
           <!-- The main section when all things will heppening -->
     <canvas id="cvs"></canvas>
->>>>>>> 141ad495338db7854c07ee1ae9ffeeb6ebc6f429
     <script src="./assets/js/index.js"></script>
   </body>
 </html>
