Remove merge artefact

2017-09-26 08:31:37 -05:00 · 2017-09-26 08:31:37 -05:00 · 698fc0d016
parent defb68e94f
commit 698fc0d016
1 changed files with 0 additions and 1 deletions
--- a/spacy/cli/train.py
+++ b/spacy/cli/train.py
@ -130,7 +130,6 @@ def train(cmd, lang, output_dir, train_data, dev_data, n_iter=20, n_sents=0,

                with meta_loc.open('w') as file_:
                    file_.write(json_dumps(meta))
->>>>>>> origin/develop
                util.set_env_log(True)
            print_progress(i, losses, scorer.scores)
    finally: