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 --- examples/bronzeage/SwadeshEng.gf | 2 -- 1 file changed, 2 deletions(-) (limited to 'examples') 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) ; -- cgit v1.2.3