A merge resolution not included in previous commit due to not saving file.

Doh.
2021-11-02 18:12:05 +00:00
parent 7437c0c5e7
commit 3908c5f955
1 changed files with 0 additions and 4 deletions
--- 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