Merge branch 'master' of ssh://korap.ids-mannheim.de:29418/KorAP/Krill
Conflicts:
Readme.md
Change-Id: I84643fffc15e6536f6004e76e239b6edbf896325
diff --git a/Readme.md b/Readme.md
index d6c0412..ede4a3d 100644
--- a/Readme.md
+++ b/Readme.md
@@ -136,7 +136,11 @@
Annotation tools and models used in preparation of the test corpora are based on the following work:
+<<<<<<< HEAD
Belica, Cyril (1994): A German Lemmatizer. Final Report MLAP93-21/WP2. Luxemburg.
+=======
+Belica, Cyril (1994): *A German Lemmatizer*. MECOLB Final Report MLAP93-21/WP2. Luxemburg.
+>>>>>>> 72430e3ed81e0a18c518fa400fb9f39fe350bf46
Bohnet, Bernd (2010): *Top accuracy and fast dependency parsing is not a contradiction*. In *Proceedings of COLING*, pp 89–97, Beijing, China.