From 6802a4f89d1431913ce3218f4db9bbe2748115e5 Mon Sep 17 00:00:00 2001 From: Robyn Speer Date: Tue, 22 Sep 2015 14:23:55 -0400 Subject: [PATCH] fix README conflict Former-commit-id: 5b918e7bb069a9068a5416228dcf5e49b7dd69ac --- README.md | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 3aa0043..b8c8dbb 100644 --- a/README.md +++ b/README.md @@ -232,20 +232,14 @@ sources: - Wikipedia, the free encyclopedia (http://www.wikipedia.org) -<<<<<<< HEAD It contains data from various SUBTLEX word lists: SUBTLEX-US, SUBTLEX-UK, -SUBTLEX-CH, SUBTLEX-DE, and SUBTLEX-NL, created by Marc Brysbaert et al. (see citations below) and -available at http://crr.ugent.be/programs-data/subtitle-frequencies. -======= -It contains data from various SUBTLEX word lists: SUBTLEX-US, SUBTLEX-UK, and -SUBTLEX-CH, created by Marc Brysbaert et al. and available at +SUBTLEX-CH, SUBTLEX-DE, and SUBTLEX-NL, created by Marc Brysbaert et al. +(see citations below) and available at http://crr.ugent.be/programs-data/subtitle-frequencies. ->>>>>>> greek-and-turkish -I (Robyn Speer) have -obtained permission by e-mail from Marc Brysbaert to distribute these wordlists -in wordfreq, to be used for any purpose, not just for academic use, under these -conditions: +I (Robyn Speer) have obtained permission by e-mail from Marc Brysbaert to +distribute these wordlists in wordfreq, to be used for any purpose, not just +for academic use, under these conditions: - Wordfreq and code derived from it must credit the SUBTLEX authors. - It must remain clear that SUBTLEX is freely available data. @@ -297,4 +291,3 @@ Twitter; it does not display or republish any Twitter content. SUBTLEX-UK: A new and improved word frequency database for British English. The Quarterly Journal of Experimental Psychology, 67(6), 1176-1190. http://www.tandfonline.com/doi/pdf/10.1080/17470218.2013.850521 -