Latest Changes

Author: SohamDeshmukh1

departments/computer/I-Scheme/Model_Answer.html

@@ -29,22 +29,6 @@ <h2>Model Answers</h2>
             </div>
         </div>
     </section>
-<<<<<<< HEAD
-    <div class="card">
-        <div class="card-header">
-          Featured
-        </div>
-        <div class="card-body">
-          <h5 class="card-title">Special title treatment</h5>
-          <p class="card-text">With supporting text below as a natural lead-in to additional content.</p>
-        </div>
-      </div>
-
-
-    </body>
-    <script src="../../../loadfooter.js"></script>
-    <!-- Include your footer and scripts -->
-=======
     <div class="container-data">
         <div class="card-data">
             <div class="main-content">
@@ -58,7 +42,6 @@ <h5 class="card-title">Special title treatment</h5>
     <script src="../../../loadfooter.js"></script>
 </body>
 <!-- Include your footer and scripts -->
->>>>>>> a790ca6f40f8877817d7af8f2ffb782b0ef7544a
 
 <script src="https://code.jquery.com/jquery-3.6.4.min.js"></script>
 <script src="../../../vendor/jquery/jquery.min.js"></script>