Fix merge conflict

docs/uofc-labyrinth/index.html

@@ -41,11 +41,7 @@
 
       <h1 id="werklund-school-of-education-2023-labyrinth">Werklund School of Education 2023 Labyrinth</h1>
 
-<<<<<<< HEAD
 <h3>Thursday, November 30th to Sunday, December 18th, 2023</h3>
-=======
-<h3 id="thursday-november-30th-to-sunday-december-10th-2023">Thursday, November 30th to Sunday, December 10th, 2023</h3>
->>>>>>> master
 
 <p>Callysto is a free, online learning tool that helps Grades 5-12 students and teachers learn and apply in-demand data science skills including data analysis and visualization, coding, and computational thinking. Our mission is to foster computational thinking and data literacy skills in Canadian schools.</p>
 
@@ -81,17 +77,11 @@ <h2 id="online-support">Online Support</h2>
 <p>Callysto team members are available to help you with your Labyrinth.</p>
 
 <ul>
-<<<<<<< HEAD
   <li>Tuesday, Dec 5th 6:00PM - 8:00PM MST</li>
   <li>Thursday, Dec 7th 6:00PM - 8:00PM MST</li>
   <li>Friday, Dec 8th 12:00PM - 2:00PM MST</li>
   <li>Tuesday, Dec 11th 6:00PM - 8:00PM MST</li>
   <li>Friday, Dec 14th 6:00PM - 8:00PM MST</li>
-=======
-  <li>Tuesday, Dec 5th 6:00PM- 8:00PM MST</li>
-  <li>Thursday, Dec 7th 6:00PM- 8:00PM MST</li>
-  <li>Friday, Dec 8th 12:00PM- 2:00PM MST</li>
->>>>>>> master
 </ul>
 
 <p>To join the video meeting, click <a href="https://meet.google.com/huh-uxim-vuv">here</a></p>