Fix merge conflict

This commit is contained in:
Matthew Honnibal 2019-09-18 21:42:11 +02:00
parent 46c02d25b1
commit e2047576c4

View File

@ -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.
```
</Accordion>
=======
>>>>>>> master
## Train {#train}