From e5653ff3515ff2b6ab6c36fc09d57606a5355619 Mon Sep 17 00:00:00 2001
From: David Harris <david_harris@hmc.edu>
Date: Fri, 31 Mar 2023 08:37:16 -0700
Subject: [PATCH] Merged privileged test

---
 tests/coverage/priv.S | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/tests/coverage/priv.S b/tests/coverage/priv.S
index 0d59a255..008d06be 100644
--- a/tests/coverage/priv.S
+++ b/tests/coverage/priv.S
@@ -36,7 +36,6 @@ main:
     addi t0, zero, 0
     csrr t0, stimecmp 
 
-<<<<<<< HEAD
     # CSR coverage
     csrw scause, zero
     csrw stval, zero
@@ -63,13 +62,4 @@ main:
 
 
 
-=======
-    # Test write to STVAL, SCAUSE, SEPC, and STIMECMP CSRs
-    li t0, 0
-    csrw stval, t0
-    csrw scause, t0
-    csrw sepc, t0
-    csrw stimecmp, t0
-    
->>>>>>> 37d289cf44530c3e3a6f53e54b06e6eda7f0c3c1
     j done