resolve conflict

KushalMeghani1644 · KushalMeghani1644 · commit 4cf193a22b8b · 2025-11-17T13:45:19.000+05:30
diff --git a/riscv/src/register.rs b/riscv/src/register.rs
@@ -131,9 +131,6 @@ mod tests;
 
 // TODO: Debug Mode Registers
 pub mod dcsr;
-<<<<<<< HEAD
 pub mod dpc;
-=======
 pub mod dscratch0;
 pub mod dscratch1;
->>>>>>> d078ccf (Implement dscratch0 and dscratch1 CSRs for RISC-V)
