From 7b2dd8497967bb2a78f7ff2055a4976a9bb2a4e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= Date: Mon, 22 Feb 2021 18:35:26 +0100 Subject: add conflict marker test --- progs/tests/simple.sy | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'progs/tests/simple.sy') diff --git a/progs/tests/simple.sy b/progs/tests/simple.sy index a82471b..48394d7 100644 --- a/progs/tests/simple.sy +++ b/progs/tests/simple.sy @@ -1,10 +1,2 @@ -<<<<<<< HEAD -print extern_test(4.0) -<<<<<<< HEAD -print extern_test(4.0) -======= -print extern_test(5.0) ->>>>>>> 2 -======= -print extern_test(5.0) ->>>>>>> 2 +print test(3.0) +print test(3.0, 4.0) -- cgit v1.2.1