Resolved merge conflict

virtual-labs-archive · Jul 18, 2016 · ec7cc02 · ec7cc02
1 parent abf9cbf
commit ec7cc02
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 40 deletions.
diff --git a/src/lab/exp1/Quizzes.html b/src/lab/exp1/Quizzes.html
@@ -375,12 +375,6 @@ <h2 class="text-h2-lightblue-small" style="font-weight: bold;margin-top: 0px;">
 				height: 38px" /></a>
 
 			</div>
-<<<<<<< HEAD
-
- 		</div>
-</footer>
-=======
->>>>>>> e3d34ae0b2c19cb82febd487af8dddad2ab1ded7
 
  		</div>
 </footer>

diff --git a/src/lab/exp2/Quizzes.html b/src/lab/exp2/Quizzes.html
@@ -339,14 +339,6 @@ <h2 class="text-h2-lightblue-small" style="font-weight: bold;margin-top: 0px;">
 				<img src="../images/social/youtube.png"
 				style="border-radius: 50%; width: 38px;
 				height: 38px" /></a>
-<<<<<<< HEAD
-
-			</div>
-
- 		</div>
-</footer>
-=======
->>>>>>> e3d34ae0b2c19cb82febd487af8dddad2ab1ded7
 
 			</div>
 

diff --git a/src/lab/exp3/Quizzes.html b/src/lab/exp3/Quizzes.html
@@ -341,13 +341,6 @@ <h2 class="text-h2-lightblue-small" style="font-weight: bold;margin-top: 0px;">
 				height: 38px" /></a>
 
 			</div>
-<<<<<<< HEAD
-=======
-
- 		</div>
-</footer>
->>>>>>> e3d34ae0b2c19cb82febd487af8dddad2ab1ded7
-
  		</div>
 </footer>
 

diff --git a/src/lab/exp4/Quizzes.html b/src/lab/exp4/Quizzes.html
@@ -375,12 +375,7 @@ <h2 class="text-h2-lightblue-small" style="font-weight: bold;margin-top: 0px;">
 				height: 38px" /></a>
 
 			</div>
-<<<<<<< HEAD
 
- 		</div>
-</footer>
-=======
->>>>>>> e3d34ae0b2c19cb82febd487af8dddad2ab1ded7
 
  		</div>
 </footer>

diff --git a/src/lab/exp6/Quizzes.html b/src/lab/exp6/Quizzes.html
@@ -373,14 +373,6 @@ <h2 class="text-h2-lightblue-small" style="font-weight: bold;margin-top: 0px;">
 				<img src="../images/social/youtube.png"
 				style="border-radius: 50%; width: 38px;
 				height: 38px" /></a>
-<<<<<<< HEAD
-
-			</div>
-
- 		</div>
-</footer>	
-=======
->>>>>>> e3d34ae0b2c19cb82febd487af8dddad2ab1ded7
 
 			</div>
 

diff --git a/src/lab/exp7/Quizzes.html b/src/lab/exp7/Quizzes.html
@@ -375,12 +375,6 @@ <h2 class="text-h2-lightblue-small" style="font-weight: bold;margin-top: 0px;">
 				height: 38px" /></a>
 
 			</div>
-<<<<<<< HEAD
-=======
-
- 		</div>
-</footer>
->>>>>>> e3d34ae0b2c19cb82febd487af8dddad2ab1ded7
 
  		</div>
 </footer>