From 3908c5f9554877ee8d677b7254a6f435705d07e4 Mon Sep 17 00:00:00 2001
From: Jonathan Woodruff <jdw57@cam.ac.uk>
Date: Tue, 2 Nov 2021 18:12:05 +0000
Subject: [PATCH] A merge resolution not included in previous commit due to not
 saving file. Doh.

---
 src_Core/RISCY_OOO/procs/lib/DirPredictor.bsv | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src_Core/RISCY_OOO/procs/lib/DirPredictor.bsv b/src_Core/RISCY_OOO/procs/lib/DirPredictor.bsv
index a3aaa94..fe48ab1 100644
--- a/src_Core/RISCY_OOO/procs/lib/DirPredictor.bsv
+++ b/src_Core/RISCY_OOO/procs/lib/DirPredictor.bsv
@@ -63,10 +63,6 @@ typedef GShareTrainInfo DirPredTrainInfo;
 typedef TourTrainInfo DirPredTrainInfo;
 `endif
 
-<<<<<<< Updated upstream
-=======
-
->>>>>>> Stashed changes
 (* synthesize *)
 module mkDirPredictor(DirPredictor#(DirPredTrainInfo));
 `ifdef DIR_PRED_BHT