diff options
Diffstat (limited to 'progs/tests/auto/conflict_markers.sy')
| -rw-r--r-- | progs/tests/auto/conflict_markers.sy | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/progs/tests/auto/conflict_markers.sy b/progs/tests/auto/conflict_markers.sy deleted file mode 100644 index 167a751..0000000 --- a/progs/tests/auto/conflict_markers.sy +++ /dev/null @@ -1,11 +0,0 @@ -start :: fn { - -<<<<<<< HEAD -print extern_test(4.0) -======= -print extern_test(5.0) ->>>>>>> 2 - -} - -// errors: [ErrorKind::SyntaxError(_, _), ErrorKind::GitConflictError(3, 7)] |