diff options
Diffstat (limited to 'progs')
| -rw-r--r-- | progs/tests/simple.sy | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/progs/tests/simple.sy b/progs/tests/simple.sy index 48394d7..a82471b 100644 --- a/progs/tests/simple.sy +++ b/progs/tests/simple.sy @@ -1,2 +1,10 @@ -print test(3.0) -print test(3.0, 4.0) +<<<<<<< HEAD +print extern_test(4.0) +<<<<<<< HEAD +print extern_test(4.0) +======= +print extern_test(5.0) +>>>>>>> 2 +======= +print extern_test(5.0) +>>>>>>> 2 |