diff options
| author | aarne <aarne@cs.chalmers.se> | 2009-03-11 16:57:28 +0000 |
|---|---|---|
| committer | aarne <aarne@cs.chalmers.se> | 2009-03-11 16:57:28 +0000 |
| commit | 1421ed2f922b86040bd4955cb23a74b7269f96c0 (patch) | |
| tree | 0f92030b68623953cfbda1cea8edac6a1222b289 /examples | |
| parent | a175874e2c144a55ea88bf6e351e7b6b9ea4ab07 (diff) | |
removed conflict marks from previous update
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/bronzeage/SwadeshEng.gf | 2 |
1 files changed, 0 insertions, 2 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) ; |