From 1421ed2f922b86040bd4955cb23a74b7269f96c0 Mon Sep 17 00:00:00 2001 From: aarne Date: Wed, 11 Mar 2009 16:57:28 +0000 Subject: removed conflict marks from previous update --- next-lib/src/Make.hs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'next-lib/src') diff --git a/next-lib/src/Make.hs b/next-lib/src/Make.hs index bd835def4..9e24f559e 100644 --- a/next-lib/src/Make.hs +++ b/next-lib/src/Make.hs @@ -152,12 +152,10 @@ demos abstr ls = "gr -number=100 | l -treebank " ++ unlexer abstr ls ++ lang (lla,la) = lla ++ "/All" ++ la ++ ".gf" compat (lla,la) = lla ++ "/Compatibility" ++ la ++ ".gf" symbol (lla,la) = lla ++ "/Symbol" ++ la ++ ".gf" -v v v v v v v -try (lla,la) = "api/Syntax" ++ la ++ ".gf" -************* + try (lla,la) = "api/Try" ++ la ++ ".gf" syntax (lla,la) = "api/Syntax" ++ la ++ ".gf" -^ ^ ^ ^ ^ ^ ^ + symbolic (lla,la) = "api/Symbolic" ++ la ++ ".gf" parse (lla,la) = "parse/Parse" ++ la ++ ".gf" -- cgit v1.2.3