Forgot about one diff

riscv-software-src · Sep 23, 2024 · 2a029d4 · 2a029d4
1 parent e8eb3be
commit 2a029d4
Showing 1 changed file with 1 addition and 4 deletions.
diff --git 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"