fixed merge conflicts

virtual-labs-archive · May 19, 2020 · 9541a05 · 9541a05
2 parents 60b07b4 + ea88313
commit 9541a05
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/src/lab/Prerequisites.html b/src/lab/Prerequisites.html
@@ -81,6 +81,7 @@
                                     <form action="search-result.html" method="get">
                                         <!-- <input type="text" class="search-textbox" placeholder="SEARCH FOR A LAB" name="q" id="q"/>
 			                        	<input type="submit" value="" class="search-button" /> -->
+
                                     </form>
                                 </li>
                             </ul>
@@ -257,4 +258,5 @@ <h4>Follow Us</h4>
 
 
 
+
 </body><!-- jQuery --></html>
diff --git a/src/lab/final-build/EXP_1sep2010/exp4/Introduction.html b/src/lab/final-build/EXP_1sep2010/exp4/Introduction.html
@@ -75,7 +75,7 @@
           <hr style="background:#ff6600 !important;  height: 8px; margin-top: 0px;"/>
         </div>
         <!-- row end -->
-      </div>
+        </div>
       <!-- container-fluid end for slider -->
       <!-- =================================================================================================================================== -->
       <div class="container-fluid" style="margin-left: 35px; margin-right: 35px;">
@@ -255,4 +255,5 @@ <h4>Follow Us</h4>
 
 
 </div>
+
 </body><!-- jQuery --></html>
diff --git a/src/lab/final-build/EXP_1sep2010/exp5/Theory.html b/src/lab/final-build/EXP_1sep2010/exp5/Theory.html
@@ -271,4 +271,5 @@ <h4>Follow Us</h4>
 
 
 
+
 </body><!-- jQuery --></html>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -271,4 +271,5 @@ <h4>Follow Us</h4>




		</body><!-- jQuery --></html>