removed conflict marks from previous update

2009-03-11 16:57:28 +00:00
parent a175874e2c
commit 1421ed2f92
2 changed files with 2 additions and 6 deletions
--- 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) ;