From 50d6472d56091d0fece3fb87837a3931215603e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= <gustav@sornas.net>
Date: Sun, 7 Mar 2021 17:47:31 +0100
Subject: move the tests

---
 progs/tests/auto/conflict_markers.sy | 11 -----------
 1 file changed, 11 deletions(-)
 delete mode 100644 progs/tests/auto/conflict_markers.sy

(limited to 'progs/tests/auto/conflict_markers.sy')

diff --git a/progs/tests/auto/conflict_markers.sy b/progs/tests/auto/conflict_markers.sy
deleted file mode 100644
index 0760582..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)]
-- 
cgit v1.2.1