Merge pull request #6 from harvard-edge/profvjreddi

Resolved a merge conflict, not sure how it slipped
harvard-edge · Sep 17, 2023 · 52448c7 · 52448c7
2 parents c608be1 + 953eceb
commit 52448c7
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/dedication.qmd b/dedication.qmd
@@ -1,7 +1,3 @@
 # Dedication {.unnumbered}
 
-<<<<<<< HEAD
 _This book is a testament to the idea that, in the vast expanse of technology and innovation, it's not always the largest systems, but the smallest ones, that can change the world._
-=======
-This book is a testament to the idea that, in the vast expanse of technology and innovation, it's not always the largest systems, but the smallest ones, that can change the world.
->>>>>>> main