From 06517631cc2297f6b9e81eeb8d8fecb9fa807f42 Mon Sep 17 00:00:00 2001
From: ethan-falicov <efalicov@hmc.edu>
Date: Wed, 10 Feb 2021 09:54:30 -0500
Subject: [PATCH] More merge conflicts yay

---
 wally-pipelined/testbench/testbench-imperas.sv | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/wally-pipelined/testbench/testbench-imperas.sv b/wally-pipelined/testbench/testbench-imperas.sv
index b8979f78a..ca97bef57 100644
--- a/wally-pipelined/testbench/testbench-imperas.sv
+++ b/wally-pipelined/testbench/testbench-imperas.sv
@@ -233,7 +233,6 @@ string tests32i[] = {
                      "rv32i/I-XOR-01","2000",
                      "rv32i/I-XORI-01","2000",
                      "rv32i/WALLY-ADD", "3000",
-<<<<<<< HEAD
                      "rv32i/WALLY-SUB", "3000",
                      "rv32i/WALLY-ADDI", "2000",
                      "rv32i/WALLY-ANDI", "2000",
@@ -244,12 +243,10 @@ string tests32i[] = {
                      "rv32i/WALLY-SLLI", "2000",
                      "rv32i/WALLY-SRLI", "2000",
                      "rv32i/WALLY-SRAI", "2000"
-=======
                      "rv32i/WALLY-LOAD", "11c00",
                      "rv32i/WALLY-SUB", "3000",
                      "rv32i/WALLY-STORE", "2000",
                      "rv32i/WALLY-JAL", "3000"
->>>>>>> 88ccaff534d6bc14ccf767006b2d25505d0ce674
 };
   string tests[];