From: Eddie Hung <eddieh@ece.ubc.ca>
Date: Sun, 17 Feb 2019 19:50:55 +0000 (-0800)
Subject: One more merge conflict
X-Git-Tag: yosys-0.9~232^2~9
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=430a7548bca6046c812f713877253f8c3d81d805;p=yosys.git

One more merge conflict
---

diff --git a/tests/tools/autotest.sh b/tests/tools/autotest.sh
index 2722cba19..b5abc3570 100755
--- a/tests/tools/autotest.sh
+++ b/tests/tools/autotest.sh
@@ -134,18 +134,13 @@ do
 		fn=$(basename $fn)
 		bn=$(basename $bn)
 
-<<<<<<< HEAD
+		rm -f ${bn}_ref.fir
 		if [[ "$ext" == "v" ]]; then
 			egrep -v '^\s*`timescale' ../$fn > ${bn}_ref.${ext}
 		else
 			"$toolsdir"/../../yosys -f "$frontend $include_opts" -b "verilog" -o ${bn}_ref.v ../${fn}
 			frontend="verilog"
 		fi
-=======
-		rm -f ${bn}_ref.fir
-
-		egrep -v '^\s*`timescale' ../$fn > ${bn}_ref.v
->>>>>>> e45f62b0c56717a23099425f078d1e56212aa632
 
 		if [ ! -f ../${bn}_tb.v ]; then
 			"$toolsdir"/../../yosys -f "$frontend $include_opts" -b "test_autotb $autotb_opts" -o ${bn}_tb.v ${bn}_ref.v