From f347260d3e62f3cd45ee6ea8461fa9e1ff8c96ac Mon Sep 17 00:00:00 2001
From: Daniel van der Schuur <schuur@astron.nl>
Date: Fri, 4 Jun 2021 14:46:13 +0200
Subject: [PATCH] -Removed diff markers.
---
libraries/dsp/st/hdllib.cfg | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/libraries/dsp/st/hdllib.cfg b/libraries/dsp/st/hdllib.cfg
index 97ca0989bf..a00e04d870 100644
--- a/libraries/dsp/st/hdllib.cfg
+++ b/libraries/dsp/st/hdllib.cfg
@@ -18,26 +18,19 @@ synth_files =
src/vhdl/st_histogram.vhd
src/vhdl/st_histogram_reg.vhd
src/vhdl/mms_st_histogram.vhd
-<<<<<<< HEAD
-
-=======
- src/vhdl/st_histogram_8_april.vhd
tb/vhdl/tb_st_pkg.vhd
->>>>>>> master
test_bench_files =
tb/vhdl/tb_st_acc.vhd
tb/vhdl/tb_st_calc.vhd
tb/vhdl/tb_mmf_st_sst.vhd
-<<<<<<< HEAD
-=======
tb/vhdl/tb_st_xsq.vhd
tb/vhdl/tb_tb_st_xsq.vhd
tb/vhdl/tb_st_xst.vhd
tb/vhdl/tb_tb_st_xst.vhd
tb/vhdl/tb_st_histogram.vhd
->>>>>>> master
+
tb/vhdl/tb_mms_st_histogram.vhd
tb/vhdl/tb_st_histogram.vhd
tb/vhdl/tb_tb_st_histogram.vhd
--
GitLab