diff options
| author | Gustav Sörnäs <gustav@sornas.net> | 2021-02-22 18:35:26 +0100 |
|---|---|---|
| committer | Gustav Sörnäs <gustav@sornas.net> | 2021-02-22 18:35:26 +0100 |
| commit | 7b2dd8497967bb2a78f7ff2055a4976a9bb2a4e5 (patch) | |
| tree | 3f073336d7b6eb9975b623a717bc93127fa57207 /progs/tests/simple.sy | |
| parent | 0d1d548032420c0e7daccfe14bc2fed18775d797 (diff) | |
| download | sylt-7b2dd8497967bb2a78f7ff2055a4976a9bb2a4e5.tar.gz | |
add conflict marker test
Diffstat (limited to 'progs/tests/simple.sy')
| -rw-r--r-- | progs/tests/simple.sy | 12 |
1 files changed, 2 insertions, 10 deletions
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) |