From 2a029d40655d017c475c2dad2414f55d614162e3 Mon Sep 17 00:00:00 2001
From: James Ball <quic_jameball@quicinc.com>
Date: Mon, 23 Sep 2024 11:00:34 -0700
Subject: [PATCH] Forgot about one diff

---
 backends/arch_gen/tasks.rake | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/backends/arch_gen/tasks.rake b/backends/arch_gen/tasks.rake
index 44ec0332d..511c18afa 100644
--- a/backends/arch_gen/tasks.rake
+++ b/backends/arch_gen/tasks.rake
@@ -107,12 +107,9 @@ file "#{$root}/.stamps/arch-gen.stamp" => (
     "csrs" => csr_hash,
     "profile_families" => profile_family_hash,
     "profiles" => profile_hash,
-<<<<<<< HEAD
     "csc_crd_families" => csc_crd_family_hash,
-    "csc_crds" => csc_crd_hash
-=======
+    "csc_crds" => csc_crd_hash,
     "manuals" => manual_hash
->>>>>>> origin/main
   }
 
   dest = "#{$root}/gen/_/arch/arch_def.yaml"