[elpa] externals/guess-language bccca49bbb 33/35: Merge pull request #37 from aglet/fix-merge

[ELPA Syncer]

branch: externals/guess-language
commit bccca49bbb27a3dff02c660d7cda8cdf83333d6e
Merge: b1fc363ca2 82b5cb598e
Author: Titus von der Malsburg <malsburg@posteo.de>
Commit: GitHub <noreply@github.com>

    Merge pull request #37 from aglet/fix-merge
    
    resolve merge conflict
---
 README.org | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/README.org b/README.org
index 63c451e6fd..aadf03150f 100644
--- a/README.org
+++ b/README.org
@@ -163,10 +163,4 @@ which LANG was detected.  These are ignored."
 
 ** Notes
 
-<<<<<<< HEAD
 - Support for Latin Serbian is based on trigrams transliterated from Cyrillic 
Serbian.  Since some Cyrillic trigrams transliterate to 4-grams in Latin, we 
truncated those but as a result have two duplicates, "e n" and "ra ".  Not 
ideal but the results are probably still robust enough.  Nonetheless, it would 
be good if someone could compute proper Latin trigrams one day.
-=======
-- Support for Latin Serbian is based on trigrams transliterated from Cyrillic 
Serbian.  Since some Cyrillic trigrams transliterated to 4-grams in Latin.  We 
truncated those but as a result have two duplicates (~"e n"~ and ~"ra "~).  Not 
ideal but results are probably still robust.  It would be good, though, if 
someone could compute proper Latin trigrams.
-
-
->>>>>>> 770fe5e (Added support for flags in mode line)