From e2047576c483a419f02ac0a2a5e77cd52c075699 Mon Sep 17 00:00:00 2001 From: Matthew Honnibal Date: Wed, 18 Sep 2019 21:42:11 +0200 Subject: [PATCH] Fix merge conflict --- website/docs/api/cli.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/website/docs/api/cli.md b/website/docs/api/cli.md index 322e1c043..5d42f6fb8 100644 --- a/website/docs/api/cli.md +++ b/website/docs/api/cli.md @@ -181,8 +181,6 @@ All output files generated by this command are compatible with | `conll`, `conllu`, `conllubio` | Universal Dependencies `.conllu` or `.conll` format. | | `ner` | NER with IOB/IOB2 tags, one token per line with columns separated by whitespace. The first column is the token and the final column is the IOB tag. Sentences are separated by blank lines and documents are separated by the line `-DOCSTART- -X- O O`. Supports CoNLL 2003 NER format. See [sample data](https://github.com/explosion/spaCy/tree/master/examples/training/ner_example_data). | | `iob` | NER with IOB/IOB2 tags, one sentence per line with tokens separated by whitespace and annotation separated by `|`, either `word|B-ENT` or `word|POS|B-ENT`. See [sample data](https://github.com/explosion/spaCy/tree/master/examples/training/ner_example_data). | -<<<<<<< HEAD - ## Debug data {#debug-data new="2.2"} Analyze, debug and validate your training and development data, get useful @@ -342,8 +340,6 @@ will not be available. ``` -======= ->>>>>>> master ## Train {#train}