diff options
Diffstat (limited to 'progs/tests/auto/conflict_markers.sy')
| -rw-r--r-- | progs/tests/auto/conflict_markers.sy | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/progs/tests/auto/conflict_markers.sy b/progs/tests/auto/conflict_markers.sy index 167a751..0760582 100644 --- a/progs/tests/auto/conflict_markers.sy +++ b/progs/tests/auto/conflict_markers.sy @@ -1,9 +1,9 @@ start :: fn { <<<<<<< HEAD -print extern_test(4.0) + print extern_test(4.0) ======= -print extern_test(5.0) + print extern_test(5.0) >>>>>>> 2 } |