From 0b15a38e324c3940318df462812c42f74a544267 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= Date: Fri, 5 Mar 2021 19:46:11 +0100 Subject: correct conflict marker test --- progs/tests/auto/conflict_markers.sy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/progs/tests/auto/conflict_markers.sy b/progs/tests/auto/conflict_markers.sy index 715a859..167a751 100644 --- a/progs/tests/auto/conflict_markers.sy +++ b/progs/tests/auto/conflict_markers.sy @@ -8,4 +8,4 @@ print extern_test(5.0) } -// errors: [ErrorKind::SyntaxError(_, _), ErrorKind::GitConflictError(2, 6)] +// errors: [ErrorKind::SyntaxError(_, _), ErrorKind::GitConflictError(3, 7)] -- cgit v1.2.1