From 953eceb06c08630b29ff1bc9da5ac2705724b44a Mon Sep 17 00:00:00 2001 From: Vijay Janapa Reddi Date: Sun, 17 Sep 2023 10:21:29 -0400 Subject: [PATCH] Resolved a merge conflict, not sure how it slipped --- dedication.qmd | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dedication.qmd b/dedication.qmd index 9d58ec13d..79c2ec2f6 100644 --- 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