-Removed diff markers.

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