From 9428d7aef6fabcb7e93d7fb2ad62d6b703996447 Mon Sep 17 00:00:00 2001
From: aarne <aarne@cs.chalmers.se>
Date: Wed, 11 Mar 2009 16:57:28 +0000
Subject: [PATCH] removed conflict marks from previous update

---
 examples/bronzeage/SwadeshEng.gf | 2 --
 next-lib/src/Make.hs             | 6 ++----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/examples/bronzeage/SwadeshEng.gf b/examples/bronzeage/SwadeshEng.gf
index 9b2cb878e..890455236 100644
--- a/examples/bronzeage/SwadeshEng.gf
+++ b/examples/bronzeage/SwadeshEng.gf
@@ -2,6 +2,4 @@
 
 concrete SwadeshEng of Swadesh = SwadeshI with
   (Syntax = SyntaxEng),
-v v v v v v v
-^ ^ ^ ^ ^ ^ ^
   (Lexicon = LexiconEng) ;
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"