removed conflict marks from previous update

This commit is contained in:
aarne committed 2009-03-11 16:57:28 +00:00
1 parent a175874e2c
commit 1421ed2f92
2 files changed
+2 -6

No files matched your search

-2
View File
@@ -2,6 +2,4 @@
concrete SwadeshEng of Swadesh = SwadeshI with
(Syntax = SyntaxEng),
v v v v v v v
^ ^ ^ ^ ^ ^ ^
(Lexicon = LexiconEng) ;