From c368b68118434be907e9362c7b61908ecec1993d Mon Sep 17 00:00:00 2001
From: toyota <toyota@cl.uni-heidelberg.de>
Date: Fri, 30 Mar 2018 18:36:42 +0200
Subject: [PATCH] remove merge conflict

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index 9a97000..35ba020 100644
--- a/README.md
+++ b/README.md
@@ -120,7 +120,6 @@ The folder experiments contains an implementation of the baseline and 40 differe
 
 * lib
 
-<<<<<<< HEAD
 The folder contains code for preprocessing Wikipedia Dataset to train own sent2vec models for the experiments and a README file. Our preprocessed Wikipedia 2017 dataset and two self-trained models of the Wikipedia 2017 dataset, that we used in our experiments with sent2vec, are provided on /proj/toyota on the server of the Institut of Computerlinguistics Heidelberg.
 Other models that we used during our experiments can be found in sense2vec and sent2vec repositories.
 
-- 
GitLab