Fix merge error causing build failures

harvard-edge · Jun 11, 2024 · ebee83b · ebee83b
1 parent 7b4f92a
commit ebee83b
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/contents/hw_acceleration/hw_acceleration.qmd b/contents/hw_acceleration/hw_acceleration.qmd
@@ -1039,8 +1039,6 @@ Here is a curated list of resources to support students and instructors in their
 * *Coming soon.*
 :::
 
-<<<<<<< HEAD
-=======
 :::{.callout-important collapse="false"}
 #### Videos
 
@@ -1052,7 +1050,6 @@ Here is a curated list of resources to support students and instructors in their
 
 :::
 
->>>>>>> 253-videos-need-cross-references
 :::{.callout-caution collapse="false"}
 #### Exercises