From b63bfc7afa1e1633d8e4e8de951572cdfc39c866 Mon Sep 17 00:00:00 2001 From: Jarred Allen Date: Sat, 20 Mar 2021 17:16:50 -0400 Subject: [PATCH] Fix conflicts in ahb-waves that snuck through manual merging --- wally-pipelined/regression/wave-dos/ahb-waves.do | 7 ------- 1 file changed, 7 deletions(-) diff --git a/wally-pipelined/regression/wave-dos/ahb-waves.do b/wally-pipelined/regression/wave-dos/ahb-waves.do index 5a6e670fb..70609fa2a 100644 --- a/wally-pipelined/regression/wave-dos/ahb-waves.do +++ b/wally-pipelined/regression/wave-dos/ahb-waves.do @@ -63,12 +63,9 @@ add wave -hex /testbench/dut/hart/ebu/CaptureDataM add wave -hex /testbench/dut/hart/ebu/InstrStall add wave -divider -<<<<<<< HEAD add wave -hex /testbench/dut/uncore/dtim/* add wave -divider -======= ->>>>>>> origin/main add wave -hex /testbench/dut/hart/ifu/PCW add wave -hex /testbench/dut/hart/ifu/InstrW add wave /testbench/InstrWName @@ -78,11 +75,7 @@ add wave -hex /testbench/dut/hart/ieu/dp/ResultW add wave -hex /testbench/dut/hart/ieu/dp/RdW add wave -divider -<<<<<<< HEAD -add wave -hex -r /testbench/* -======= add wave -hex /testbench/dut/uncore/dtim/* add wave -divider add wave -hex -r /testbench/* ->>>>>>> origin/main