合并冲突

README.md

@@ -1,9 +0,0 @@
-# fastNLP
-
-[![Build Status](https://travis-ci.org/fastnlp/fastNLP.svg?branch=master)](https://travis-ci.org/fastnlp/fastNLP)
-[![codecov](https://codecov.io/gh/fastnlp/fastNLP/branch/master/graph/badge.svg)](https://codecov.io/gh/fastnlp/fastNLP)
-[![Pypi](https://img.shields.io/pypi/v/fastNLP.svg)](https://pypi.org/project/fastNLP)
-![Hex.pm](https://img.shields.io/hexpm/l/plug.svg)
-[![Documentation Status](https://readthedocs.org/projects/fastnlp/badge/?version=latest)](http://fastnlp.readthedocs.io/?badge=latest)
-
-dev0.8.0正在开发中

tests/core/metrics/test_span_f1_rec_acc_torch.py

@@ -1,5 +1,5 @@
 import pytest
-import unittest
+
 from collections import Counter
 import os, sys
 import copy