From ebee83bdd8fa6545bc595c47dd76e3aedfaa682b Mon Sep 17 00:00:00 2001 From: Vijay Janapa Reddi Date: Tue, 11 Jun 2024 15:59:59 -0600 Subject: [PATCH] Fix merge error causing build failures --- contents/hw_acceleration/hw_acceleration.qmd | 3 --- 1 file changed, 3 deletions(-) diff --git a/contents/hw_acceleration/hw_acceleration.qmd b/contents/hw_acceleration/hw_acceleration.qmd index aca712496..de0c9c743 100644 --- 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